diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java
index fb88aa90..f9a94bac 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java
@@ -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";
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
index 602c542f..1c92e48d 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml
@@ -28,6 +28,7 @@
+
@@ -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
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index fb384be0..0a783eab 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -408,11 +408,17 @@ public class ProcessProjectStandardService extends ServiceImpl processInfoVO, ProcessDTO processDTO, boolean pass) {
Task task = processDTO.getTask();
String parentExecutionId = task.getFormKey();
- ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
+ //查询表单
+ ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
+ List termList = businessInfoDTO.getProcessProjectStandardTermList();
+ List designEngineerList = termList.stream().map(ProcessProjectStandardTerm::getDesignEngineer).distinct().collect(Collectors.toList());
+
// 完成任务
+ ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,parentExecutionId);
String taskId = processDTO.getTaskId();
Map 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 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);