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
2024-01-19 14:32:52 +08:00
parent d513650be4
commit 422a6cd813
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java
+1
View File
@@ -5,6 +5,7 @@ package com.jero.modules.activiti.process.projectstandard.common;
* @date 2024-01-15 17:25
*/
public class ProcessProjectStandardCommon {
public static final String PASS = "pass";
public static final String STANDARDS_ENGINEER = "standardsEngineer";
public static final String MANAGER_LEADER_LIST = "managerLeaderList";
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
+3
View File
@@ -28,6 +28,7 @@
<result column="responsible_unit_leader" property="responsibleUnitLeader"/>
<result column="term_user_id" property="termUserId"/>
<result column="assess_results" property="assessResults"/>
<result column="model_series" property="modelSeries"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
@@ -67,6 +68,7 @@
ppstu.id term_user_id,
ppstu.not_involved,
ppstu.assess_results,
ppstu.model_series,
ppstu.description,
ppstu.file_id,
ppstu.design_engineer
@@ -91,6 +93,7 @@
ppstu.not_involved,
ppstu.module_owner,
ppstu.assess_results,
ppstu.model_series,
ppstu.description,
ppstu.file_id,
ppstu.design_engineer
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+10 -4
View File
@@ -408,11 +408,17 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
private void mkzrrffApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
Task task = processDTO.getTask();
String parentExecutionId = task.getFormKey();
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
//查询表单
ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList();
List<String> designEngineerList = termList.stream().map(ProcessProjectStandardTerm::getDesignEngineer).distinct().collect(Collectors.toList());
// 完成任务
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.PASS, pass);
variables.put(ProcessProjectStandardCommon.PASS, pass);
variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
taskService.complete(taskId, variables);
}
//部所主管级领导审批
@@ -472,7 +478,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
variables.put(ProcessProjectStandardCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerList.size());
}
String taskId = processDTO.getTaskId();
variables.put(ProcessProjectAssessCommon.PASS, pass);
variables.put(ProcessProjectStandardCommon.PASS, pass);
taskService.complete(taskId, variables);
}
//法规工程师审批
@@ -545,7 +551,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
// 完成任务
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.PASS, pass);
variables.put(ProcessProjectStandardCommon.PASS, pass);
variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST, designEngineerList);
variables.put(ProcessProjectStandardCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size());
taskService.complete(taskId, variables);