From 251ad2d99b35bcc029d8a2a6fa139586e60cb165 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 19 Dec 2023 14:26:55 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E4=BF=AE=E6=94=B9=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=88=B0=E8=AE=BE=E8=AE=A1=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/ProcessProjectAssessCommon.java | 2 + .../service/ProcessProjectAssessService.java | 72 ++++++++++++------- 2 files changed, 47 insertions(+), 27 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java index 961784ac..dcc1cd09 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java @@ -27,6 +27,8 @@ public class ProcessProjectAssessCommon { public static final String GBMZGJLDSP = "gbmzgjldsp"; //模块负责人修改 public static final String MKFZRXG = "mkfzrxg"; + //设计工程师评估2 + public static final String SJGCSPG2 = "sjgcspg2"; //法规工程师归档 public static final String FGGCSGD = "fggcsgd"; 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 ae0e29f2..eb432bd0 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 @@ -176,6 +176,7 @@ public class ProcessProjectAssessService extends ServiceImpl processInfoVO, ProcessDTO processDTO, boolean pass) { + String assessmentId = processInfoVO.getBusinessId(); + ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); + String originUserId = processApprovalRecord.getOriginUserId(); + Task task = processDTO.getTask(); + String executionId = task.getExecutionId(); + String formKey = task.getFormKey(); + + ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); + List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); + List allTermUserList = new ArrayList<>(); + for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { + ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); + termUser.setId(processProjectAssessTerm.getTermUserId()); + termUser.setParentExecutionId(executionId); + termUser.setEvaluationFeedback(processProjectAssessTerm.getEvaluationFeedback()); + termUser.setDescription(processProjectAssessTerm.getDescription()); + termUser.setFileId(processProjectAssessTerm.getFileId()); + termUser.setExpectedTime(processProjectAssessTerm.getExpectedTime()); + allTermUserList.add(termUser); + } + processProjectAssessTermUserService.updateBatchById(allTermUserList); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId); + wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey); + List projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper); + List designEngineerList = projectAssessTermUsers.stream().map(ProcessProjectAssessTermUser::getDesignEngineer).distinct().collect(Collectors.toList()); + tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId); + processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG2, designEngineerList); + // 完成任务 + String taskId = processDTO.getTaskId(); + Map variables = new HashMap<>(); + variables.put(ProcessProjectAssessCommon.PASS, pass); + variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST, designEngineerList); + variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size()); + taskService.complete(taskId, variables); + } + public void submit(ProcessInfoVO processInfoVO) { BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); @@ -451,11 +494,12 @@ public class ProcessProjectAssessService extends ServiceImpl processInfoVO, ProcessDTO processDTO) { - String businessId = processInfoVO.getBusinessId(); - ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); - String originUserId = processApprovalRecord.getOriginUserId(); - Task task = processDTO.getTask(); - String executionId = task.getExecutionId(); - - ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - List processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList(); - List allTermUserList = new ArrayList<>(); - for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) { - ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser(); - termUser.setId(processProjectAssessTerm.getTermUserId()); - termUser.setEvaluationFeedback(processProjectAssessTerm.getEvaluationFeedback()); - termUser.setDescription(processProjectAssessTerm.getDescription()); - termUser.setFileId(processProjectAssessTerm.getFileId()); - termUser.setExpectedTime(processProjectAssessTerm.getExpectedTime()); - allTermUserList.add(termUser); - } - processProjectAssessTermUserService.updateBatchById(allTermUserList); - // 完成任务 - String taskId = processDTO.getTaskId(); - taskService.complete(taskId); - } - public void saveToDraft(ProcessInfoVO processInfoVO) { ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();