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

sign

dev
luotaiqian 2026-08-05 19:36:01 +08:00
parent d057e1fdda
commit 8a09b5762e
6 changed files with 55 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/EvalProcessControlController.java
View File

@ -66,7 +66,7 @@ public class EvalProcessControlController {
return evalProcessControlApi.listProjectFiles(projectId);
}
@ApiOperation("项目过程文件列表")
@ApiOperation("testSms")
@GetMapping("/test-sms")
public SingleResponse<Void> testSms() {
smsRemote.sendMessage("19122631081", "123456");

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

@ -169,17 +169,12 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
evalReviewItemGateway.add(itemE);
}
SignTaskPersonCmd signTaskPersonCmd = new SignTaskPersonCmd();
signTaskPersonCmd.setSignerPersonnelId(cmd.getControllerPersonnelId());
signTaskPersonCmd.setSignerName(cmd.getControllerName());
// 保存签字任务到 eval_sign_task
upsertSignTask(entity.getId(), projectId, project.getOrgId(),
ProjectStageEnum.PROCESS_CONTROL.getMsg(), ProjectStageEnum.PROCESS_CONTROL.getVal(), signTaskPersonCmd);
ProjectStageEnum.PROCESS_CONTROL.getMsg(), ProjectStageEnum.PROCESS_CONTROL.getVal(), cmd.getSignTaskPersonCmd());
safetyMessageGateway.saveSignMsg(ProjectStageEnum.PROCESS_CONTROL.getMsg()
, ProjectStageEnum.PROCESS_CONTROL.getVal(), String.valueOf(projectId)
, String.valueOf(signTaskPersonCmd.getSignerPersonnelId()));
, String.valueOf(cmd.getSignTaskPersonCmd().getSignerPersonnelId()));
return SingleResponse.success();
}

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

@ -108,13 +108,13 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi {
.select(EvalProjectMemberDO::getRole, EvalProjectMemberDO::getPersonnelName, EvalProjectMemberDO::getId)
.last("limit 1"));
if (!CollectionUtils.isEmpty(evalProjectMemberDOS)) {
evalSignTaskCO.setSignerPersonnelName(evalProjectMemberDOS.get(0).getPersonnelName());
evalSignTaskCO.setSignerRoles(ProjectRoleEnum.fromVals(evalProjectMemberDOS.get(0).getRole()));
evalSignTaskCO.setSignerPersonnelName(evalProjectMemberDOS.get(0).getPersonnelName());
evalSignTaskCO.setSignerRoles(ProjectRoleEnum.fromVals(evalProjectMemberDOS.get(0).getRole()));
}
return evalSignTaskCO;
}).collect(Collectors.toList());
return PageResponse.of(
co ,
co,
pageResult.getTotal());
}
@ -162,13 +162,38 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi {
.set(EvalTechReviewDO::getReviewerSignatureTaskStatus, SignatureTaskStatusEnum.COMPLETED.getCode()));
}
if (ProjectStageEnum.PROCESS_CONTROL.getVal().equals(evalSignTaskDO.getNodeCode())) {
doProcessController(evalSignTaskDO, cmd);
}
return SingleResponse.success(true);
}
/**
* doProcessController
*
* @param evalSignTaskDO evalSignTaskDO
* @param cmd cmd
*/
public void doProcessController(EvalSignTaskDO evalSignTaskDO, EditSignTaskSaveCmd cmd) {
LambdaQueryWrapper<EvalProcessControlDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(EvalProcessControlDO::getId, evalSignTaskDO.getBizRefId());
queryWrapper.select(EvalProcessControlDO::getReviewerSignatureTaskStatus
, EvalProcessControlDO::getOrgHeadSignatureTaskStatus);
EvalProcessControlDO evalProcessControlDO = evalProcessControlMapper.selectOne(queryWrapper);
String code = SignatureTaskStatusEnum.COMPLETED.getCode();
if (!evalProcessControlDO.getReviewerSignatureTaskStatus().equals(code)) {
evalProcessControlMapper.update(new LambdaUpdateWrapper<EvalProcessControlDO>()
.eq(EvalProcessControlDO::getId, evalSignTaskDO.getBizRefId())
.eq(EvalProcessControlDO::getProjectId, evalSignTaskDO.getProjectId())
.set(EvalProcessControlDO::getReviewerSignatureUrl, cmd.getSignerUrl())
.set(EvalProcessControlDO::getReviewerSignatureTaskStatus, SignatureTaskStatusEnum.COMPLETED.getCode()));
}
return SingleResponse.success(true);
if (!evalProcessControlDO.getOrgHeadSignatureTaskStatus().equals(code)) {
evalProcessControlMapper.update(new LambdaUpdateWrapper<EvalProcessControlDO>()
.eq(EvalProcessControlDO::getId, evalSignTaskDO.getBizRefId())
.eq(EvalProcessControlDO::getProjectId, evalSignTaskDO.getProjectId())
.set(EvalProcessControlDO::getOrgHeadSignatureUrl, cmd.getSignerUrl())
.set(EvalProcessControlDO::getOrgHeadSignatureTaskStatus, SignatureTaskStatusEnum.COMPLETED.getCode()));
}
}
@Override

2
safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProcessControlDetailCO.java
View File

@ -23,7 +23,7 @@ public class EvalProcessControlDetailCO {
@ApiModelProperty("审核项列表")
private List<EvalReviewItemCo> reviewItems;
@ApiModelProperty("签字任务人员")
@ApiModelProperty("机构负责人签字任务人员")
private SignTaskPersonCo signTaskPersonCo;
@ApiModelProperty("项目归档移交人")

10
safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/EvalProcessControlConfirmCmd.java
View File

@ -24,14 +24,10 @@ public class EvalProcessControlConfirmCmd {
@ApiModelProperty(value = "审核结果 passed 通过，not_passed 未通过", example = "passed")
private String resultCode;
@ApiModelProperty("过程控制负责人人员id")
@ApiModelProperty("过程控制负责签字任务人员")
@NotNull
private Long controllerPersonnelId;
@ApiModelProperty("过程控制负责人姓名")
@NotBlank
private String controllerName;
@Valid
private SignTaskPersonCmd signTaskPersonCmd;
@ApiModelProperty(value = "总体过程控制意见")
@Size(max = 2000)

27
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/queryservice/impl/EvalProcessControlQueryServiceImpl.java
View File

@ -30,16 +30,27 @@ public class EvalProcessControlQueryServiceImpl implements EvalProcessControlQue
EvalProcessControlDO processControl = evalProcessControlMapper.selectOne(new LambdaQueryWrapper<EvalProcessControlDO>()
.eq(EvalProcessControlDO::getProjectId, projectId)
.eq(EvalProcessControlDO::getOrgId, orgId)
.select(EvalProcessControlDO::getId, EvalProcessControlDO::getHandoverFormUrl));
if (processControl == null || processControl.getHandoverFormUrl() == null) {
.select(EvalProcessControlDO::getId,
EvalProcessControlDO::getHandoverFormUrl,
EvalProcessControlDO::getOrgHeadSignatureUrl));
if (processControl == null) {
return Collections.emptyList();
}
List<EvalProjectFileCO> files = new ArrayList<>();
EvalProjectFileCO co = new EvalProjectFileCO();
co.setProcessName(ProjectStageEnum.PROCESS_CONTROL.getMsg());
co.setItemName("归档交接单");
co.setProjectDocUrl(processControl.getHandoverFormUrl());
files.add(co);
List<EvalProjectFileCO> files = new ArrayList<>(4);
if (processControl.getHandoverFormUrl() != null) {
EvalProjectFileCO co = new EvalProjectFileCO();
co.setProcessName(ProjectStageEnum.PROCESS_CONTROL.getMsg());
co.setItemName("归档交接单");
co.setProjectDocUrl(processControl.getHandoverFormUrl());
files.add(co);
}
if (processControl.getOrgHeadSignatureUrl() != null) {
EvalProjectFileCO co = new EvalProjectFileCO();
co.setProcessName(ProjectStageEnum.PROCESS_CONTROL.getMsg());
co.setItemName("机构负责人签字");
co.setProjectDocUrl(processControl.getOrgHeadSignatureUrl());
files.add(co);
}
return files;
}
}