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

feat: 签字

dev
zhanglei 2026-07-24 15:20:27 +08:00
parent 5cb71429cd
commit e32eee64cc
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,12 @@ import org.qinan.safetyeval.domain.gateway.SafetyMessageGateway;
import org.qinan.safetyeval.domain.query.EvalSignTaskQuery; import org.qinan.safetyeval.domain.query.EvalSignTaskQuery;
import org.qinan.safetyeval.domain.query.PageResult; import org.qinan.safetyeval.domain.query.PageResult;
import org.qinan.safetyeval.domain.service.EvalSignTaskDomainService; import org.qinan.safetyeval.domain.service.EvalSignTaskDomainService;
import org.qinan.safetyeval.infrastructure.dataobject.EvalProjectMemberDO;
import org.qinan.safetyeval.infrastructure.dataobject.EvalRiskParticipantDO;
import org.qinan.safetyeval.infrastructure.dataobject.EvalSignTaskDO;
import org.qinan.safetyeval.infrastructure.mapper.EvalProjectMemberMapper;
import org.qinan.safetyeval.infrastructure.mapper.EvalRiskParticipantMapper;
import org.qinan.safetyeval.infrastructure.mapper.EvalSignTaskMapper;
import org.qinan.safetyeval.infrastructure.dataobject.*; import org.qinan.safetyeval.infrastructure.dataobject.*;
import org.qinan.safetyeval.infrastructure.mapper.*; import org.qinan.safetyeval.infrastructure.mapper.*;
import org.qinan.safetyeval.infrastructure.support.InstitutionOrgSupport; import org.qinan.safetyeval.infrastructure.support.InstitutionOrgSupport;
@ -31,10 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
@ -57,6 +60,8 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi {
@Autowired @Autowired
private EvalRiskParticipantMapper evalRiskParticipantMapper; private EvalRiskParticipantMapper evalRiskParticipantMapper;
@Autowired @Autowired
private EvalProjectMapper evalProjectMapper;
@Autowired
private EvalInternalReviewMapper evalInternalReviewMapper; private EvalInternalReviewMapper evalInternalReviewMapper;
@Autowired @Autowired
private EvalTechReviewMapper evalTechReviewMapper; private EvalTechReviewMapper evalTechReviewMapper;
@ -108,8 +113,21 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi {
EvalSignTaskQuery domainQuery = evalSignTaskCmdConvertor.convertPageQueryToQ(query); EvalSignTaskQuery domainQuery = evalSignTaskCmdConvertor.convertPageQueryToQ(query);
domainQuery.setOrgId(institutionOrgSupport.resolveCurrentOrgId()); domainQuery.setOrgId(institutionOrgSupport.resolveCurrentOrgId());
PageResult<EvalSignTaskEntity> pageResult = evalSignTaskDomainService.page(domainQuery); PageResult<EvalSignTaskEntity> pageResult = evalSignTaskDomainService.page(domainQuery);
List<EvalSignTaskCO> co = evalSignTaskCmdConvertor.convertEListToCOList(pageResult.getRecords());
for (EvalSignTaskCO evalSignTaskCO : co) {
EvalProjectDO evalProjectDO = evalProjectMapper.selectById(evalSignTaskCO.getProjectId());
evalSignTaskCO.setProjectName(evalProjectDO.getProjectName());
evalSignTaskCO.setNodeName(Objects.requireNonNull(ProjectStageEnum.fromVal(evalSignTaskCO.getNodeCode())).getMsg());
List<EvalProjectMemberDO> evalProjectMemberDOS = evalProjectMemberMapper.selectList(new LambdaQueryWrapper<EvalProjectMemberDO>()
.eq(EvalProjectMemberDO::getProjectId, evalSignTaskCO.getProjectId())
.eq(EvalProjectMemberDO::getPersonnelId, evalSignTaskCO.getSignerPersonnelId())
.select(EvalProjectMemberDO::getRole, EvalProjectMemberDO::getPersonnelName)
.last("limit 1"));
evalSignTaskCO.setSignerPersonnelName(evalProjectMemberDOS.get(0).getPersonnelName());
evalSignTaskCO.setSignerRoles(ProjectStageEnum.fromVals(evalProjectMemberDOS.get(0).getRole()));
}
return PageResponse.of( return PageResponse.of(
evalSignTaskCmdConvertor.convertEListToCOList(pageResult.getRecords()), co ,
pageResult.getTotal()); pageResult.getTotal());
} }

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

@ -11,17 +11,26 @@ public class EvalSignTaskCO {
private String id; private String id;
private String orgId; private String orgId;
private String projectId; private String projectId;
@ApiModelProperty(value = "项目名称")
private String projectName;
private String nodeCode; private String nodeCode;
@ApiModelProperty(value = "节点名称")
private String nodeName;
private String bizRefId; private String bizRefId;
@ApiModelProperty("待签人员id")
private String signerPersonnelId; private String signerPersonnelId;
@ApiModelProperty("待签人员名称")
private String signerPersonnelName;
private String taskTitle; private String taskTitle;
@ApiModelProperty("待签角色")
private String signerRoles;
@ApiModelProperty(value = "任务状态编码：1待签 2已签 3已作废", example = "1") @ApiModelProperty(value = "任务状态编码：1待签 2已签 3已作废", example = "1")
private Integer taskStatusCode; private Integer taskStatusCode;
@ApiModelProperty(value = "任务状态名称：待签/已签/已作废", example = "待签") @ApiModelProperty(value = "任务状态名称：待签/已签/已作废", example = "待签")
private String taskStatusName; private String taskStatusName;
@ApiModelProperty(value = "任务下发时间")
private LocalDateTime issueTime; private LocalDateTime issueTime;
private String signerUrl; private String signerUrl;
private String remarks; private String remarks;