From 0d5850f63b43ce4ee67edfcf586b2eef1672e37f Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Tue, 21 Jul 2026 16:29:46 +0800 Subject: [PATCH] init --- .../EvalInternalReviewController.java | 7 +++ .../EvalInternalReviewExecutor.java | 48 +++++++++++++++++ .../institution/EvalInternalReviewApi.java | 2 + .../EvalInternalReviewConfirmCmd.java | 20 +++++++ .../item/request/EvalReviewItemAddCmd.java | 21 ++++---- .../item/request/EvalReviewItemPageQry.java | 4 +- .../item/request/EvalReviewItemUpdateCmd.java | 6 +-- .../item/response/EvalReviewItemCo.java | 4 +- .../gateway/EvalProjectMemberGateway.java | 2 + .../domain/item/model/EvalReviewItemE.java | 2 +- .../domain/query/EvalProjectMemberQuery.java | 1 + .../EvalProjectMemberGatewayImpl.java | 54 +++++++++---------- .../domainobject/EvalReviewItemDO.java | 2 +- .../EvalReviewItemQueryService.java | 11 ++++ .../impl/EvalReviewItemQueryServiceImpl.java | 6 +++ .../repository/EvalReviewItemRepository.java | 11 ++++ .../impl/EvalReviewItemRepositoryImpl.java | 10 ++++ .../support/NodeWriteAuthority.java | 4 +- 18 files changed, 164 insertions(+), 51 deletions(-) create mode 100644 safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewConfirmCmd.java diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java index 2649ca2..81c98aa 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalInternalReviewController.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.qinan.safetyeval.client.api.institution.EvalInternalReviewApi; import org.qinan.safetyeval.client.co.institution.EvalInternalReviewCO; +import org.qinan.safetyeval.client.co.institution.EvalInternalReviewDetailCO; import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.institution.EvalInternalReviewSaveCmd; import org.springframework.validation.annotation.Validated; @@ -31,4 +32,10 @@ public class EvalInternalReviewController { public SingleResponse get(@ApiParam("项目ID") @RequestParam Long projectId) { return evalInternalReviewApi.getByProject(projectId); } + + @ApiOperation("按项目查询详情（内审人成员+审核项）") + @GetMapping("/detail") + public SingleResponse detail(@ApiParam("项目ID") @RequestParam Long projectId) { + return evalInternalReviewApi.getDetailByProject(projectId); + } } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java index e371ecf..0363fc0 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java @@ -5,17 +5,27 @@ import org.qinan.safetyeval.app.executor.institution.support.EvalNodeCoConverter import org.qinan.safetyeval.app.executor.institution.support.EvalProjectNodeSupport; import org.qinan.safetyeval.client.api.institution.EvalInternalReviewApi; import org.qinan.safetyeval.client.co.institution.EvalInternalReviewCO; +import org.qinan.safetyeval.client.co.institution.EvalInternalReviewDetailCO; import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.institution.EvalInternalReviewSaveCmd; +import org.qinan.safetyeval.client.item.response.EvalReviewItemCo; +import org.qinan.safetyeval.domain.constant.ReviewDimensionEnum; import org.qinan.safetyeval.domain.entity.EvalInternalReviewEntity; import org.qinan.safetyeval.domain.entity.EvalProjectEntity; +import org.qinan.safetyeval.domain.entity.EvalProjectMemberEntity; import org.qinan.safetyeval.domain.exception.BizException; import org.qinan.safetyeval.domain.exception.ErrorCode; import org.qinan.safetyeval.domain.gateway.EvalInternalReviewGateway; +import org.qinan.safetyeval.domain.gateway.EvalProjectMemberGateway; import org.qinan.safetyeval.domain.support.EvalNodeCodes; +import org.qinan.safetyeval.infrastructure.convertor.EvalInternalReviewConvertor; +import org.qinan.safetyeval.infrastructure.persistence.queryservice.EvalReviewItemQueryService; +import org.qinan.safetyeval.infrastructure.support.NodeWriteAuthority; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; @Service public class EvalInternalReviewExecutor implements EvalInternalReviewApi { @@ -24,6 +34,12 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi { private EvalInternalReviewGateway evalInternalReviewGateway; @Resource private EvalProjectNodeSupport evalProjectNodeSupport; + @Resource + private EvalProjectMemberGateway evalProjectMemberGateway; + @Resource + private EvalReviewItemQueryService evalReviewItemQueryService; + @Resource + private EvalInternalReviewConvertor evalInternalReviewConvertor; @Override public SingleResponse getOrSave(EvalInternalReviewSaveCmd cmd) { @@ -56,4 +72,36 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi { } return SingleResponse.success(EvalNodeCoConverter.toInternalCO(entity)); } + + @Override + public SingleResponse getDetailByProject(Long projectId) { + // 1. 查询项目成员中的内审人信息 + List members = evalProjectMemberGateway + .listByProjectIdAndRoleCode(projectId, NodeWriteAuthority.ROLE_INTERNAL_REVIEWER); + + // 2. 查询内审记录，未查询到则内审记录字段为空 + EvalInternalReviewEntity entity = evalInternalReviewGateway.getByProjectId(projectId, null); + EvalInternalReviewDetailCO detailCO = new EvalInternalReviewDetailCO(); + detailCO.setReviewers(evalInternalReviewConvertor.toMemberCOs(members)); + if (entity != null) { + detailCO.setInternalReview(evalInternalReviewConvertor.toInternalCO(entity)); + // 3. 通过内审记录id查询审核项列表 + detailCO.setReviewItems(evalReviewItemQueryService.listByBizIdAndBizType( + entity.getId(), ReviewDimensionEnum.TypeEnum.EVAL_INTERNAL_REVIEW.getCode())); + } else { + // 未查询到内审记录，按审核维度枚举构建默认审核项 + detailCO.setReviewItems(ReviewDimensionEnum.getListByType(ReviewDimensionEnum.TypeEnum.EVAL_INTERNAL_REVIEW) + .stream() + .map(dimension -> { + EvalReviewItemCo item = new EvalReviewItemCo(); + item.setBizType(ReviewDimensionEnum.TypeEnum.EVAL_INTERNAL_REVIEW.getCode()); + item.setReviewDimensionCode(dimension.getCode()); + item.setReviewDimensionName(dimension.getLabel()); + item.setReviewFocus(dimension.getReviewFocus()); + return item; + }) + .collect(Collectors.toList())); + } + return SingleResponse.success(detailCO); + } } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalInternalReviewApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalInternalReviewApi.java index 65c93bd..19fc2fb 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalInternalReviewApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/institution/EvalInternalReviewApi.java @@ -1,10 +1,12 @@ package org.qinan.safetyeval.client.api.institution; import org.qinan.safetyeval.client.co.institution.EvalInternalReviewCO; +import org.qinan.safetyeval.client.co.institution.EvalInternalReviewDetailCO; import org.qinan.safetyeval.client.dto.SingleResponse; import org.qinan.safetyeval.client.dto.institution.EvalInternalReviewSaveCmd; public interface EvalInternalReviewApi { SingleResponse getOrSave(EvalInternalReviewSaveCmd cmd); SingleResponse getByProject(Long projectId); + SingleResponse getDetailByProject(Long projectId); } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewConfirmCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewConfirmCmd.java new file mode 100644 index 0000000..a3aab22 --- /dev/null +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalInternalReviewConfirmCmd.java @@ -0,0 +1,20 @@ +package org.qinan.safetyeval.client.dto.institution; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.qinan.safetyeval.client.item.request.EvalReviewItemAddCmd; + +import javax.validation.Valid; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.List; + +@Data +public class EvalInternalReviewConfirmCmd { + + @ApiModelProperty("审核项列表") + @NotNull + @Size(min = 1, max = 16) + @Valid + private List reviewItems; +} diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemAddCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemAddCmd.java index 48d2930..0aeb691 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemAddCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemAddCmd.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.io.Serializable; /** @@ -21,44 +21,43 @@ public class EvalReviewItemAddCmd implements Serializable { * 业务类型 ： 内审->eval_internal_review ; 技审->eval_tech_review */ @ApiModelProperty(value = "业务类型 ： 内审->eval_internal_review ; 技审->eval_tech_review", required = true) - @NotBlank(message = "业务类型 ： 内审->eval_internal_review ; 技审->eval_tech_review不能为空") + @Size(max = 64) private String bizType; /** * 业务id */ @ApiModelProperty(value = "业务id", required = true) - @NotNull(message = "业务id不能为空") private Long bizId; /** * 审核维度code */ @ApiModelProperty(value = "审核维度code") + @Size(max = 128) private String reviewDimensionCode; /** * 审核维度 名称 */ @ApiModelProperty(value = "审核维度 名称") + @Size(max = 256) private String reviewDimensionName; /** * 审核重点 */ @ApiModelProperty(value = "审核重点") + @Size(max = 512) private String reviewFocus; /** - * 结论 ,conform_to 符合，to_be_revised 需修改 + * 结论 ,conform_to 符合，not_conform_to 不符合 */ - @ApiModelProperty(value = "结论 ,conform_to 符合，to_be_revised 需修改", required = true) - @NotBlank(message = "结论 ,conform_to 符合，to_be_revised 需修改不能为空") + @ApiModelProperty(value = "结论 ,conform_to 符合，not_conform_to 不符合", required = true) + @NotBlank(message = "结论 ,conform_to 符合，not_conform_to 不符合不能为空") + @Size(max = 64) private String reviewConclusion; /** * 审核意见 */ @ApiModelProperty(value = "审核意见") + @Size(max = 1024) private String reviewOpinion; - /** - * 环境 - */ - @ApiModelProperty(value = "环境") - private String env; } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemPageQry.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemPageQry.java index 81ca2f6..5f9abd8 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemPageQry.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemPageQry.java @@ -40,9 +40,9 @@ public class EvalReviewItemPageQry extends PageQuery { @ApiModelProperty(value = "审核重点") private String reviewFocus; /** - * 结论 ,conform_to 符合，to_be_revised 需修改 + * 结论 ,conform_to 符合，not_conform_to 不符合 */ - @ApiModelProperty(value = "结论 ,conform_to 符合，to_be_revised 需修改") + @ApiModelProperty(value = "结论 ,conform_to 符合，not_conform_to 不符合") private String reviewConclusion; /** * 审核意见 diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemUpdateCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemUpdateCmd.java index e3025fc..0f931a6 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemUpdateCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/request/EvalReviewItemUpdateCmd.java @@ -47,10 +47,10 @@ public class EvalReviewItemUpdateCmd implements Serializable { @ApiModelProperty(value = "审核重点") private String reviewFocus; /** - * 结论 ,conform_to 符合，to_be_revised 需修改 + * 结论 ,conform_to 符合，not_conform_to 不符合 */ - @ApiModelProperty(value = "结论 ,conform_to 符合，to_be_revised 需修改", required = true) - @NotBlank(message = "结论 ,conform_to 符合，to_be_revised 需修改不能为空") + @ApiModelProperty(value = "结论 ,conform_to 符合，not_conform_to 不符合", required = true) + @NotBlank(message = "结论 ,conform_to 符合，not_conform_to 不符合不能为空") private String reviewConclusion; /** * 审核意见 diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/response/EvalReviewItemCo.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/response/EvalReviewItemCo.java index 80fc282..b25907c 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/response/EvalReviewItemCo.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/item/response/EvalReviewItemCo.java @@ -42,9 +42,9 @@ public class EvalReviewItemCo extends ClientObject { @ApiModelProperty(value = "审核重点") private String reviewFocus; /** - * 结论 ,conform_to 符合，to_be_revised 需修改 + * 结论 ,conform_to 符合，not_conform_to 不符合 */ - @ApiModelProperty(value = "结论 ,conform_to 符合，to_be_revised 需修改") + @ApiModelProperty(value = "结论 ,conform_to 符合，not_conform_to 不符合") private String reviewConclusion; /** * 审核意见 diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalProjectMemberGateway.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalProjectMemberGateway.java index 991d01f..891ecab 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalProjectMemberGateway.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/gateway/EvalProjectMemberGateway.java @@ -20,6 +20,8 @@ public interface EvalProjectMemberGateway { List listByProjectId(Long projectId, Long orgId); + List listByProjectIdAndRoleCode(Long projectId, String roleCode); + List listProjectIdsByPersonnelId(Long personnelId, Long orgId); List listByPersonnelId(Long personnelId, Long orgId); diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/item/model/EvalReviewItemE.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/item/model/EvalReviewItemE.java index 558da8a..b4ce37f 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/item/model/EvalReviewItemE.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/item/model/EvalReviewItemE.java @@ -41,7 +41,7 @@ public class EvalReviewItemE extends BaseE { */ private String reviewFocus; /** - * 结论 ,conform_to 符合，to_be_revised 需修改 + * 结论 ,conform_to 符合，not_conform_to 不符合 */ private String reviewConclusion; /** diff --git a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalProjectMemberQuery.java b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalProjectMemberQuery.java index 707aa4f..7cab39a 100644 --- a/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalProjectMemberQuery.java +++ b/safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/query/EvalProjectMemberQuery.java @@ -10,4 +10,5 @@ public class EvalProjectMemberQuery { private Long orgId; private Long projectId; private Long personnelId; + private String roleCode; } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectMemberGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectMemberGatewayImpl.java index b8be7c2..809227d 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectMemberGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/EvalProjectMemberGatewayImpl.java @@ -7,6 +7,7 @@ import org.qinan.safetyeval.domain.entity.EvalProjectMemberEntity; import org.qinan.safetyeval.domain.gateway.EvalProjectMemberGateway; import org.qinan.safetyeval.domain.query.EvalProjectMemberQuery; import org.qinan.safetyeval.domain.query.PageResult; +import org.qinan.safetyeval.infrastructure.convertor.EvalProjectMemberDoConvertor; import org.qinan.safetyeval.infrastructure.dataobject.EvalProjectMemberDO; import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMemberMapper; import org.qinan.safetyeval.infrastructure.support.InsertFieldDefaults; @@ -27,6 +28,9 @@ public class EvalProjectMemberGatewayImpl implements EvalProjectMemberGateway { @Resource private OrgContextResolver orgContextResolver; + @Resource + private EvalProjectMemberDoConvertor evalProjectMemberDoConvertor; + @Override public EvalProjectMemberEntity save(EvalProjectMemberEntity entity) { EvalProjectMemberDO dataObject = toDO(entity); @@ -42,7 +46,7 @@ public class EvalProjectMemberGatewayImpl implements EvalProjectMemberGateway { if (dataObject == null || !"false".equals(dataObject.getDeleteEnum())) { return null; } - return toEntity(dataObject); + return evalProjectMemberDoConvertor.convertDoToE(dataObject); } @Override @@ -64,7 +68,7 @@ public class EvalProjectMemberGatewayImpl implements EvalProjectMemberGateway { Page page = new Page<>(query.getPageNum(), query.getPageSize()); IPage result = evalProjectMemberMapper.selectPage(page, buildQueryWrapper(query)); List entities = result.getRecords().stream() - .map(this::toEntity) + .map(evalProjectMemberDoConvertor::convertDoToE) .collect(Collectors.toList()); return PageResult.of(entities, result.getTotal(), result.getCurrent(), result.getSize()); } @@ -75,7 +79,20 @@ public class EvalProjectMemberGatewayImpl implements EvalProjectMemberGateway { query.setProjectId(projectId); query.setOrgId(orgId); return evalProjectMemberMapper.selectList(buildQueryWrapper(query)).stream() - .map(this::toEntity) + .map(evalProjectMemberDoConvertor::convertDoToE) + .collect(Collectors.toList()); + } + + @Override + public List listByProjectIdAndRoleCode(Long projectId, String roleCode) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(EvalProjectMemberDO::getDeleteEnum, "false"); + wrapper.eq(EvalProjectMemberDO::getProjectId, projectId); + wrapper.eq(EvalProjectMemberDO::getRoleCode, roleCode); + + wrapper.orderByDesc(EvalProjectMemberDO::getCreateTime); + return evalProjectMemberMapper.selectList(wrapper).stream() + .map(evalProjectMemberDoConvertor::convertDoToE) .collect(Collectors.toList()); } @@ -96,7 +113,7 @@ public class EvalProjectMemberGatewayImpl implements EvalProjectMemberGateway { query.setPersonnelId(personnelId); query.setOrgId(orgId); return evalProjectMemberMapper.selectList(buildQueryWrapper(query)).stream() - .map(this::toEntity) + .map(evalProjectMemberDoConvertor::convertDoToE) .collect(Collectors.toList()); } @@ -132,37 +149,16 @@ public class EvalProjectMemberGatewayImpl implements EvalProjectMemberGateway { if (query.getPersonnelId() != null) { wrapper.eq(EvalProjectMemberDO::getPersonnelId, query.getPersonnelId()); } + if (query.getRoleCode() != null) { + wrapper.eq(EvalProjectMemberDO::getRoleCode, query.getRoleCode()); + } wrapper.orderByDesc(EvalProjectMemberDO::getCreateTime); return wrapper; } private EvalProjectMemberDO toDO(EvalProjectMemberEntity entity) { - EvalProjectMemberDO dataObject = new EvalProjectMemberDO(); + EvalProjectMemberDO dataObject = evalProjectMemberDoConvertor.convertEToDo(entity); dataObject.setOrgId(orgContextResolver.resolveOrgId(entity.getOrgId())); - dataObject.setProjectId(entity.getProjectId()); - dataObject.setPersonnelId(entity.getPersonnelId()); - dataObject.setPersonnelName(entity.getPersonnelName()); - dataObject.setRoleCode(entity.getRoleCode()); - dataObject.setRoleName(entity.getRoleName()); - dataObject.setLeaderFlag(entity.getLeaderFlag()); - dataObject.setTenantId(entity.getTenantId()); return dataObject; } - - private EvalProjectMemberEntity toEntity(EvalProjectMemberDO dataObject) { - if (dataObject == null) { - return null; - } - EvalProjectMemberEntity entity = new EvalProjectMemberEntity(); - entity.setId(dataObject.getId()); - entity.setOrgId(dataObject.getOrgId()); - entity.setProjectId(dataObject.getProjectId()); - entity.setPersonnelId(dataObject.getPersonnelId()); - entity.setPersonnelName(dataObject.getPersonnelName()); - entity.setRoleCode(dataObject.getRoleCode()); - entity.setRoleName(dataObject.getRoleName()); - entity.setLeaderFlag(dataObject.getLeaderFlag()); - entity.setTenantId(dataObject.getTenantId()); - return entity; - } } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalReviewItemDO.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalReviewItemDO.java index 642b316..a059783 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalReviewItemDO.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalReviewItemDO.java @@ -38,7 +38,7 @@ public class EvalReviewItemDO extends BaseDO { */ private String reviewFocus; /** - * 结论 ,conform_to 符合，to_be_revised 需修改 + * 结论 ,conform_to 符合，not_conform_to 不符合 */ private String reviewConclusion; /** diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/EvalReviewItemQueryService.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/EvalReviewItemQueryService.java index a77857f..00be249 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/EvalReviewItemQueryService.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/EvalReviewItemQueryService.java @@ -5,6 +5,8 @@ import org.qinan.safetyeval.client.item.request.EvalReviewItemPageQry; import org.qinan.safetyeval.client.item.response.EvalReviewItemCo; import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalReviewItemDO; +import java.util.List; + /** * 审核项信息 * @@ -28,4 +30,13 @@ public interface EvalReviewItemQueryService { * @return */ PageResponse listEvalReviewItemPage(EvalReviewItemPageQry evalReviewItemPageQry); + + /** + * 根据业务id与业务类型查询审核项列表 + * + * @param bizId 业务id + * @param bizType 业务类型 + * @return 审核项CO列表 + */ + List listByBizIdAndBizType(Long bizId, String bizType); } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalReviewItemQueryServiceImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalReviewItemQueryServiceImpl.java index f3746c9..6fa2a50 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalReviewItemQueryServiceImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalReviewItemQueryServiceImpl.java @@ -39,4 +39,10 @@ public class EvalReviewItemQueryServiceImpl implements EvalReviewItemQueryServic return PageHelper.pageToResponse(evalReviewItemDoPage, evalReviewItemCoS); } + @Override + public List listByBizIdAndBizType(Long bizId, String bizType) { + List evalReviewItemDOS = evalReviewItemRepository.listByBizIdAndBizType(bizId, bizType); + return evalReviewItemDoConvertor.converDosToCos(evalReviewItemDOS); + } + } diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/EvalReviewItemRepository.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/EvalReviewItemRepository.java index 0f6c599..ee083c0 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/EvalReviewItemRepository.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/EvalReviewItemRepository.java @@ -5,6 +5,8 @@ import com.jjb.saas.framework.repository.repo.BaseRepository; import org.qinan.safetyeval.client.item.request.EvalReviewItemPageQry; import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalReviewItemDO; +import java.util.List; + /** * 审核项信息 * @@ -29,6 +31,15 @@ public interface EvalReviewItemRepository extends BaseRepository listEvalReviewItemPage(IPage iPage, EvalReviewItemPageQry evalReviewItemPageQry); + /** + * 根据业务id与业务类型查询审核项列表 + * + * @param bizId 业务id + * @param bizType 业务类型 + * @return 审核项列表 + */ + List listByBizIdAndBizType(Long bizId, String bizType); + /** * 新增审核项信息 * diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalReviewItemRepositoryImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalReviewItemRepositoryImpl.java index ebe5909..f956fec 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalReviewItemRepositoryImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalReviewItemRepositoryImpl.java @@ -13,6 +13,7 @@ import org.qinan.safetyeval.infrastructure.persistence.repository.EvalReviewItem import org.springframework.stereotype.Service; import java.util.Arrays; +import java.util.List; /** * 审核项信息 @@ -62,6 +63,15 @@ public class EvalReviewItemRepositoryImpl extends BaseRepositoryImpl listByBizIdAndBizType(Long bizId, String bizType) { + return super.lambdaQuery() + .eq(EvalReviewItemDO::getBizId, bizId) + .eq(EvalReviewItemDO::getBizType, bizType) + .eq(EvalReviewItemDO::getDeleteEnum, BooleanEnum.FALSE.getValue()) + .list(); + } + @Override public Boolean addEvalReviewItem(EvalReviewItemDO evalReviewItemDO) { return super.save(evalReviewItemDO); diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/NodeWriteAuthority.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/NodeWriteAuthority.java index 68de27e..f63fc64 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/NodeWriteAuthority.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/support/NodeWriteAuthority.java @@ -31,8 +31,8 @@ public class NodeWriteAuthority { private static final String ROLE_CONTRACT_OWNER = "CONTRACT_OWNER"; private static final String ROLE_SURVEY_OWNER = "SURVEY_OWNER"; private static final String ROLE_DRAFT_OWNER = "DRAFT_OWNER"; - private static final String ROLE_INTERNAL_REVIEWER = "INTERNAL_REVIEWER"; - private static final String ROLE_TECH_REVIEWER = "TECH_REVIEWER"; + public static final String ROLE_INTERNAL_REVIEWER = "INTERNAL_REVIEWER"; + public static final String ROLE_TECH_REVIEWER = "TECH_REVIEWER"; private static final String ROLE_PROCESS_OWNER = "PROCESS_OWNER"; private static final String ROLE_MEMBER = "MEMBER";