diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml index ce4e19d2..48731321 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml @@ -73,7 +73,9 @@ , - ppatu.id term_user_id + ppatu.id term_user_id, + ppatu.design_engineer, + ppatu.module_owner from process_project_assess_term ppat left join process_project_assess_term_user ppatu on ppat.id = ppatu.term_id where ppat.assessment_id = #{assessmentId} 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 5a1857e8..a6752cc3 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 @@ -863,12 +863,13 @@ public class ProcessProjectAssessService extends ServiceImpl processInfoVO) { - ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - if (businessInfoDTO != null) { - ProcessProjectAssess processProjectAssess = businessInfoDTO.getProcessProjectAssess(); - if (processProjectAssess != null) { - processInfoVO.setBusinessId(processProjectAssess.getId()); - } - } - // 流程信息 BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); basicProcessInfoDTO.setProcessType(ProcessTypeEnum.PROJECT_ASSESS.getValue()); // 流程类型 + //保存businessId + String processInstanceId = basicProcessInfoDTO.getProcessInstanceId(); + if (StringUtils.isNotBlank(processInstanceId)){ + ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId); + String projectId = processAll.getProjectId(); + processInfoVO.setBusinessId(projectId); + } processHandleService.saveToDraft(processInfoVO); } 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 89a698b7..6c7c9b5c 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 @@ -299,6 +299,13 @@ public class ProcessProjectNotMetService extends ServiceImpl