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 ddbbc0cf..8fd3f055 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 @@ -320,6 +320,7 @@ public class ProcessProjectStandardService extends ServiceImpl processProjectStandardTermList = businessInfoDTO.getProcessProjectStandardTermList(); for (ProcessProjectStandardTerm term : processProjectStandardTermList) { + term.setId(null); term.setProcessId(processId); term.setImplementationDate(implementationDate); } @@ -533,11 +534,17 @@ public class ProcessProjectStandardService extends ServiceImpl notCompliantList = termUserService.list(wrapper); Map> termIdMap = CollStreamUtil.groupByKey(notCompliantList, ProcessProjectStandardTermUser::getTermId); + //查询全部评估 + wrapper.clear(); + wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); + List allTermUserList = termUserService.list(wrapper); + Map> allTermIdMap = CollStreamUtil.groupByKey(allTermUserList, ProcessProjectStandardTermUser::getTermId); //查询表单 ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); List termList = businessInfoDTO.getProcessProjectStandardTermList(); List carbonCopyPersonnelList = new ArrayList<>(); List updateTermList = new ArrayList<>(); + List updateTermUserList = new ArrayList<>(); Date date = new Date(); for (ProcessProjectStandardTerm term : termList) { ProcessProjectStandardTerm term1 = new ProcessProjectStandardTerm(); @@ -548,13 +555,6 @@ public class ProcessProjectStandardService extends ServiceImpl termUserList = allTermIdMap.get(termId); + for (ProcessProjectStandardTermUser termUser : termUserList) { + ProcessProjectStandardTermUser updateTermUser = new ProcessProjectStandardTermUser(); + updateTermUser.setId(termUser.getId()); + String designEngineer1 = termUser.getDesignEngineer(); + term1.setAssessResults(assessResults); + if(StringUtils.isBlank(designEngineer1)){ + designEngineer1 = termUser.getModuleOwner(); + } + if(StringUtils.isBlank(designEngineer1)){ + designEngineer1 = termUser.getResponsibleUnitLeader(); + } + updateTermUser.setDesignEngineer(designEngineer1); + updateTermUserList.add(updateTermUser); + } + } //推送数据到法规项目库 lawsSpecialProjectLibraryService.save(projectLibrary); } //更新数据 if (pass){ termService.updateBatchById(updateTermList); + termUserService.updateBatchById(updateTermUserList); } // 完成任务 String taskId = processDTO.getTaskId();