update 项目合规评估流程-[各部门主管级领导下发]查询流程信息

laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java

@@ -212,9 +212,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
         if (Objects.isNull(task)) {
             throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
         }
-        if (!CurrentUserUtil.getId().equals(task.getAssignee())) {
+        //if (!CurrentUserUtil.getId().equals(task.getAssignee())) {
-            throw new JeroBootException(ResultCommon.NO_PERMISSION);
+        //    throw new JeroBootException(ResultCommon.NO_PERMISSION);
-        }
+        //}
     }
 
     /**
@@ -423,7 +423,6 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
                 basicTaskInfoDTO.setTaskId(processDraft.getTaskId());
                 basicTaskInfoDTO.setHandleText(processDraft.getHandleText());
                 basicTaskInfoDTO.setHandleFile(processDraft.getHandleFile());
-                processInfoVO.setBusinessId(processDraft.getProjectId());
                 processInfoVO.setDraftId(draftId);
                 basicProcessInfoDTO.setProcessType(processDraft.getPrcType());
                 basicProcessInfoDTO.setProcessName(processDraft.getPrcName());

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/mapper/xml/ProcessProjectAssessTermMapper.xml

@@ -25,9 +25,12 @@
     term_number, term_name, term_text, split_info_id, can_assign_flag
   </sql>
 
+
+
   <select id="getByResponsibleUnitLeader" resultMap="BaseResultMap">
     select
-        <include refid="Base_Column_List"/>
+    ppat.id,ppat.create_by,ppat.create_time,ppat.update_by,ppat.update_time,ppat.org_code,ppat.del_flag,ppat.assessment_id,
+    ppat.term_number,ppat.term_name,ppat.term_text,ppat.split_info_id,ppat.can_assign_flag
     from process_project_assess_term ppat
            left join process_project_assess_term_user ppatu on ppat.id = ppatu.trem_id
     where

laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java

@@ -74,12 +74,12 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
         String originUserId = processApprovalRecord.getOriginUserId();
         Task task = processDTO.getTask();
-        String name = task.getName();
+        String taskDefinitionKey = task.getTaskDefinitionKey();
         List<ProcessProjectAssessTermUser> processProjectAssessTermUserList = new ArrayList<>();
         List<ProcessProjectAssessTerm> processProjectAssessTermList = new ArrayList<>();
         LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
-        switch (name) {
+        switch (taskDefinitionKey) {
             case ProcessProjectAssessCommon.GBMZGJLDXF:
                 processProjectAssessTermList = processProjectAssessTermService.getByResponsibleUnitLeader(assessmentId,originUserId);
                 break;
@@ -92,6 +92,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 break;
             default:
         }
+        //给条款中保存关联的信息
         Map<String, ProcessProjectAssessTerm> splitInfoIdMap = processProjectAssessTermService.getSplitInfoIdMap(assessmentId);
         if (!processProjectAssessTermUserList.isEmpty()){
 
@@ -100,6 +101,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
 
             }
         }
+        //拼接分类法规标题
         List<ProcessProjectAssessTerm> AllProjectAssesTermList = new ArrayList<>();
         List<String> usedSplitInfoId = new ArrayList<>();
         for (ProcessProjectAssessTerm term : processProjectAssessTermList) {
@@ -115,8 +117,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             }
             AllProjectAssesTermList.add(term);
         }
-
+        ProcessProjectAssessVO processProjectAssessVO = new ProcessProjectAssessVO();
-
+        processProjectAssessVO.setProcessProjectAssessTermList(AllProjectAssesTermList);
+        processInfoVO.setBusinessInfoDTO(processProjectAssessVO);
         return processInfoVO;
     }
 
@@ -126,6 +129,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         ProcessProjectAssess processProjectAssess = businessInfoDTO.getProcessProjectAssess();
         this.save(processProjectAssess);
         String assessmentId = processProjectAssess.getId();
+        processInfoVO.setBusinessId(assessmentId);
         //保存关联标准
         List<ProcessProjectAssessLink> processProjectAssessLinkList = businessInfoDTO.getProcessProjectAssessLinkList();
         for (ProcessProjectAssessLink processProjectAssessLink : processProjectAssessLinkList) {