diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java index 9b40bf99..e447e89c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java @@ -465,13 +465,6 @@ public class ProcessProjectAssessService extends ServiceImpl variables = new HashMap<>(); - variables.put(ProcessProjectAssessCommon.PASS, pass); - taskService.complete(taskId, variables); - ThreadLocalUtil.remove(); if (!Objects.equals(userId,originUserId)){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId); @@ -491,6 +484,13 @@ public class ProcessProjectAssessService extends ServiceImpl variables = new HashMap<>(); + variables.put(ProcessProjectAssessCommon.PASS, pass); + taskService.complete(taskId, variables); + ThreadLocalUtil.remove(); } private void gbmzgjldspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean 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 08b2b14f..4183c2e1 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 @@ -31,7 +31,9 @@ import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.laws.common.util.CurrentUserUtil; import com.jero.modules.projectLibrary.entity.LawsEvaluationNotMet; import com.jero.modules.projectLibrary.service.ILawsEvaluationNotMetService; +import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; +import org.activiti.engine.runtime.Execution; import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -63,6 +65,8 @@ public class ProcessProjectNotMetService extends ServiceImpl queryProcessInfoVO(String draftId, String processInstanceId, String taskId) { if (StringUtils.isNotBlank(draftId) && StringUtils.isBlank(taskId)) { @@ -251,19 +255,9 @@ public class ProcessProjectNotMetService extends ServiceImpl 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); + Execution execution = processDTO.getExecution(); + String executionId = execution.getId(); + //更新未符合项列表状态 ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); List processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks(); @@ -288,7 +282,21 @@ public class ProcessProjectNotMetService extends ServiceImpl userIdList = new ArrayList<>(); userIdList.add(userId); processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectNotMetCommon.FGGCSSP, userIdList); + runtimeService.setVariable(executionId,ProcessProjectNotMetCommon.STANDARDS_ENGINEER,userId); } + // 完成任务 + Map variables = new HashMap<>(); + if (!pass){ + String businessId = processInfoVO.getBusinessId(); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(ProcessProjectNotMetLink::getProcessId,businessId); + wrapper1.last("limit 1"); + ProcessProjectNotMetLink projectNotMetLink = processProjectNotMetLinkService.getOne(wrapper1); + 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) { 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 94fc4a6c..8c5914e4 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 @@ -509,6 +509,7 @@ public class ProcessProjectStandardService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); @@ -634,7 +632,7 @@ public class ProcessProjectStandardService extends ServiceImpl updateTermUserList = new ArrayList<>(); for (ProcessProjectStandardTermUser termUser : termUserList) { ProcessProjectStandardTermUser update = new ProcessProjectStandardTermUser(); - termUser.setResponsibleUnitLeader(userId); + update.setResponsibleUnitLeader(userId); update.setId(termUser.getId()); updateTermUserList.add(update); } @@ -643,7 +641,12 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); + userIdList.add(userId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.FGGCSSP, userIdList); + runtimeService.setVariable(executionId,ProcessProjectStandardCommon.STANDARDS_ENGINEER,userId); + } taskService.complete(taskId, variables); if (pass){ for (ProcessProjectStandardTerm term : termList) { @@ -805,12 +814,7 @@ public class ProcessProjectStandardService extends ServiceImpl userIdList = new ArrayList<>(); - userIdList.add(userId); - processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.FGGCSSP, userIdList); - } + } //部所主管级领导下发