diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java index 5609837b..b2e19eb2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/common/ProcessProjectNotMetCommon.java @@ -8,6 +8,7 @@ public class ProcessProjectNotMetCommon { public static final String STANDARDS_ENGINEER = "standardsEngineer"; public static final String MANAGER_LEADER = "managerLeader"; public static final String DESIGN_ENGINEER = "designEngineer"; + public static final String PASS = "pass"; /** *法规工程师发起整改 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java index 3c07c915..26d8e758 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java @@ -164,19 +164,40 @@ public class ProcessProjectNotMetService extends ServiceImpl variables = new HashMap<>(); - variables.put(ProcessProjectAssessCommon.PASS, pass); - taskService.complete(taskId, variables); + } private void zgjldspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { - + // 完成任务 + Map variables = new HashMap<>(); + if (!pass){ + String businessId = processInfoVO.getBusinessId(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessProjectNotMetLink::getProcessId,businessId); + wrapper.last("limit 1"); + ProcessProjectNotMetLink projectNotMetLink = processProjectNotMetLinkService.getOne(wrapper); + String engineerId = projectNotMetLink.getEngineerId(); + variables.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, engineerId); + } + variables.put(ProcessProjectNotMetCommon.PASS, pass); + taskService.complete(processDTO.getTaskId(), variables); } private void fggcsspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass) { - + // 完成任务 + Map variables = new HashMap<>(); + if (!pass){ + String businessId = processInfoVO.getBusinessId(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessProjectNotMetLink::getProcessId,businessId); + wrapper.last("limit 1"); + ProcessProjectNotMetLink projectNotMetLink = processProjectNotMetLinkService.getOne(wrapper); + String engineerId = projectNotMetLink.getEngineerId(); + variables.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, engineerId); + } + variables.put(ProcessProjectNotMetCommon.PASS, pass); + taskService.complete(processDTO.getTaskId(), variables); } public void submit(ProcessInfoVO processInfoVO) { @@ -199,6 +220,7 @@ public class ProcessProjectNotMetService extends ServiceImpl