cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

dev
luotaiqian 2026-07-28 14:35:36 +08:00
parent c295878eb5
commit 9d37179894
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalInternalReviewExecutor.java
View File

@ -163,13 +163,14 @@ public class EvalInternalReviewExecutor implements EvalInternalReviewApi {
} }
EvalInternalReviewEntity entity = evalInternalReviewGateway.getByProjectId(projectId, project.getOrgId()); EvalInternalReviewEntity entity = evalInternalReviewGateway.getByProjectId(projectId, project.getOrgId());
if (entity == null) { if (entity == null) {
// 没有数据则新增，并下发签字任务 throw new BizException(ErrorCode.EVAL_INTERNAL_REVIEW_NOT_FOUND);
entity = new EvalInternalReviewEntity(); // // 没有数据则新增，并下发签字任务
entity.setOrgId(project.getOrgId()); // entity = new EvalInternalReviewEntity();
entity.setProjectId(projectId); // entity.setOrgId(project.getOrgId());
entity.setStatusCode(1); // entity.setProjectId(projectId);
entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode()); // entity.setStatusCode(1);
evalInternalReviewGateway.save(entity); // entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode());
// evalInternalReviewGateway.save(entity);
} else { } else {
entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode()); entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode());
evalInternalReviewGateway.modify(entity); evalInternalReviewGateway.modify(entity);

9
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java
View File

@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.qinan.safetyeval.app.executor.institution.support.EvalCmdCopy; import org.qinan.safetyeval.app.executor.institution.support.EvalCmdCopy;
import org.qinan.safetyeval.app.executor.institution.support.EvalNodeCoConverter;
import org.qinan.safetyeval.app.executor.institution.support.EvalProjectNodeSupport; import org.qinan.safetyeval.app.executor.institution.support.EvalProjectNodeSupport;
import org.qinan.safetyeval.app.item.convertor.EvalReviewItemCmdConvertor; import org.qinan.safetyeval.app.item.convertor.EvalReviewItemCmdConvertor;
import org.qinan.safetyeval.client.api.institution.EvalProcessControlApi; import org.qinan.safetyeval.client.api.institution.EvalProcessControlApi;
@ -125,7 +124,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
EvalCmdCopy.apply(cmd, entity); EvalCmdCopy.apply(cmd, entity);
evalProjectNodeSupport.fillNodeStatus(entity.getStatusCode(), entity); evalProjectNodeSupport.fillNodeStatus(entity.getStatusCode(), entity);
entity = evalProcessControlGateway.modify(entity); entity = evalProcessControlGateway.modify(entity);
return SingleResponse.success(EvalNodeCoConverter.toProcessCO(entity)); return SingleResponse.success(evalProcessControlConvertor.toProcessCO(entity));
} }
@Override @Override
@ -247,7 +246,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
if (entity == null) { if (entity == null) {
throw new BizException(ErrorCode.EVAL_PROCESS_NOT_FOUND); throw new BizException(ErrorCode.EVAL_PROCESS_NOT_FOUND);
} }
return SingleResponse.success(EvalNodeCoConverter.toProcessCO(entity)); return SingleResponse.success(evalProcessControlConvertor.toProcessCO(entity));
} }
@Override @Override
@ -268,7 +267,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
EvalProcessControlDetailCO detailCO = new EvalProcessControlDetailCO(); EvalProcessControlDetailCO detailCO = new EvalProcessControlDetailCO();
detailCO.setControllers(evalProcessControlConvertor.toMemberCOs(members)); detailCO.setControllers(evalProcessControlConvertor.toMemberCOs(members));
if (entity != null) { if (entity != null) {
detailCO.setProcessControl(EvalNodeCoConverter.toProcessCO(entity)); detailCO.setProcessControl(evalProcessControlConvertor.toProcessCO(entity));
// 3. 通过过程控制记录id查询审核项列表 // 3. 通过过程控制记录id查询审核项列表
detailCO.setReviewItems(evalReviewItemQueryService.listByBizIdAndBizType( detailCO.setReviewItems(evalReviewItemQueryService.listByBizIdAndBizType(
entity.getId(), ReviewDimensionEnum.TypeEnum.EVAL_PROCESS_CONTROL.getCode())); entity.getId(), ReviewDimensionEnum.TypeEnum.EVAL_PROCESS_CONTROL.getCode()));
@ -344,7 +343,7 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
// 归档项目资料：将所有项目文件以 ARCHIVED 资料类型存入 eval_project_doc // 归档项目资料：将所有项目文件以 ARCHIVED 资料类型存入 eval_project_doc
upsertArchivedProjectDocs(projectId, project); upsertArchivedProjectDocs(projectId, project);
projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.PROCESS_CONTROL.getNode()); projectStageSyncService.onNodeCompleted(projectId, ProjectStageEnum.PROCESS_CONTROL.getNode());
return SingleResponse.success(EvalNodeCoConverter.toProcessCO(entity)); return SingleResponse.success(evalProcessControlConvertor.toProcessCO(entity));
} }
@Override @Override

15
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalTechReviewExecutor.java
View File

@ -172,13 +172,14 @@ public class EvalTechReviewExecutor implements EvalTechReviewApi {
} }
EvalTechReviewEntity entity = evalTechReviewGateway.getByProjectId(projectId, project.getOrgId()); EvalTechReviewEntity entity = evalTechReviewGateway.getByProjectId(projectId, project.getOrgId());
if (entity == null) { if (entity == null) {
// 没有数据则新增，并下发签字任务 throw new BizException(ErrorCode.EVAL_TECH_REVIEW_NOT_FOUND);
entity = new EvalTechReviewEntity(); // // 没有数据则新增，并下发签字任务
entity.setOrgId(project.getOrgId()); // entity = new EvalTechReviewEntity();
entity.setProjectId(projectId); // entity.setOrgId(project.getOrgId());
entity.setStatusCode(1); // entity.setProjectId(projectId);
entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode()); // entity.setStatusCode(1);
evalTechReviewGateway.save(entity); // entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode());
// evalTechReviewGateway.save(entity);
} else { } else {
entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode()); entity.setReviewerSignatureTaskStatus(SignatureTaskStatusEnum.DISPATCHED.getCode());
evalTechReviewGateway.modify(entity); evalTechReviewGateway.modify(entity);

6
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/convertor/EvalProcessControlConvertor.java
View File

@ -1,6 +1,7 @@
package org.qinan.safetyeval.infrastructure.convertor; package org.qinan.safetyeval.infrastructure.convertor;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.qinan.safetyeval.client.co.institution.EvalProcessControlCO;
import org.qinan.safetyeval.client.co.institution.EvalProjectMemberCO; import org.qinan.safetyeval.client.co.institution.EvalProjectMemberCO;
import org.qinan.safetyeval.client.dto.institution.EvalProcessControlConfirmCmd; import org.qinan.safetyeval.client.dto.institution.EvalProcessControlConfirmCmd;
import org.qinan.safetyeval.domain.entity.EvalProcessControlEntity; import org.qinan.safetyeval.domain.entity.EvalProcessControlEntity;
@ -19,6 +20,11 @@ public interface EvalProcessControlConvertor {
*/ */
EvalProcessControlEntity applyConfirmCmd(EvalProcessControlConfirmCmd cmd); EvalProcessControlEntity applyConfirmCmd(EvalProcessControlConfirmCmd cmd);
/**
* 将 entity 转换为过程控制 CO。
*/
EvalProcessControlCO toProcessCO(EvalProcessControlEntity entity);
EvalProjectMemberCO toMemberCO(EvalProjectMemberEntity entity); EvalProjectMemberCO toMemberCO(EvalProjectMemberEntity entity);
List<EvalProjectMemberCO> toMemberCOs(List<EvalProjectMemberEntity> entities); List<EvalProjectMemberCO> toMemberCOs(List<EvalProjectMemberEntity> entities);