ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 项目合规评估流程 各部门主管级领导审批 以评估人为维度展示

Browse Source
This commit is contained in:
lijiarao
2023-12-20 16:04:01 +08:00
parent 2773e31097
commit 7749232292
3 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/entity/ProcessProjectAssessTerm.java
+25 -1
View File
@@ -121,12 +121,26 @@ public class ProcessProjectAssessTerm {
@ApiModelProperty(value = "责任单位id")
private String responsibleUnits;
/**
* 责任单位负责人id
*/
@TableField(exist = false)
@ApiModelProperty(value = "责任单位负责人ids")
private String responsibleUnitLeader;
/**
* 责任单位负责人id
*/
@TableField(exist = false)
@ApiModelProperty(value = "责任单位负责人ids")
private String responsibleUnitLeaders;
/**
* 模块负责人id
*/
@TableField(exist = false)
@ApiModelProperty(value = "模块负责人ids")
private String moduleOwner;
/**
* 模块负责人id
*/
@@ -138,7 +152,7 @@ public class ProcessProjectAssessTerm {
* 设计工程师
*/
@TableField(exist = false)
@ApiModelProperty(value = "设计工程师id")
@ApiModelProperty(value = "设计工程师")
private String designEngineer;
/**
@@ -148,6 +162,16 @@ public class ProcessProjectAssessTerm {
@ApiModelProperty(value = "设计工程师ids")
private String designEngineers;
/**评估人ID*/
@TableField(exist = false)
@ApiModelProperty(value = "评估人ID")
private String assessorId;
/**评估人名字*/
@TableField(exist = false)
@ApiModelProperty(value = "评估人名字")
private String assessorName;
/**
* 不涉及原因
*/
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml
+17 -4
View File
@@ -24,6 +24,9 @@
<result column="expected_time" jdbcType="TIMESTAMP" property="expectedTime" />
<result column="not_involved" property="notInvolved"/>
<result column="design_engineer" property="designEngineer"/>
<result column="module_owner" property="moduleOwner"/>
<result column="responsible_unit_leader" property="responsibleUnitLeader"/>
</resultMap>
<sql id="Base_Column_List">
@@ -38,9 +41,17 @@
<property name="alias" value="ppat"/>
</include>
,
ppatu.id term_user_id
from process_project_assess_term ppat
left join process_project_assess_term_user ppatu on ppat.id = ppatu.term_id
ppatu.id term_user_id,
ppatu.not_involved,
ppatu.evaluation_feedback,
ppatu.description,
ppatu.file_id,
ppatu.expected_time,
ppatu.design_engineer,
ppatu.module_owner,
ppatu.responsible_unit_leader
from process_project_assess_term_user ppatu
left join process_project_assess_term ppat on ppat.id = ppatu.term_id
where ppat.assessment_id = #{assessmentId}
and ppatu.responsible_unit_leader = #{originUserId}
and ppatu.id is not null
@@ -88,7 +99,9 @@
ppatu.description,
ppatu.file_id,
ppatu.expected_time,
ppatu.design_engineer
ppatu.design_engineer,
ppatu.module_owner,
ppatu.responsible_unit_leader
from process_project_assess_term_user ppatu
left join process_project_assess_term ppat on ppat.id = ppatu.term_id
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+10 -4
View File
@@ -148,8 +148,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
case ProcessProjectAssessCommon.GBMZGJLDSP:
processProjectAssessTermList = processProjectAssessTermService.getByResponsibleUnitLeader(assessmentId, originUserId);
wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
processProjectAssessTermUserList = processProjectAssessTermUserService.list(wrapper);
previousNodeHandlerMap = processProjectAssessTermUserList.stream()
previousNodeHandlerMap = processProjectAssessTermUserService.list(wrapper).stream()
.collect(
Collectors.groupingBy(ProcessProjectAssessTermUser::getTermId,
Collectors.mapping(item -> {
@@ -246,8 +245,15 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
String evaluationFeedback = term.getEvaluationFeedback();
term.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback));
term.setProcessProjectAssessTermUserList(termUsers);
String designEngineer = term.getDesignEngineer();
term.setDesignEngineer(userNameMap.get(designEngineer));
String assessorId = term.getDesignEngineer();
if (assessorId == null){
assessorId = term.getModuleOwner();
}
if (assessorId == null){
assessorId = term.getResponsibleUnitLeader();
}
term.setAssessorId(assessorId);
term.setAssessorName(userNameMap.get(assessorId));
String previousNodeHandler = previousNodeHandlerMap.get(termId);
term.setPreviousNodeHandler(previousNodeHandler);
term.setPromoter(createUserName);