From d2f1e9d96ff37a368c5625c87692034d37175b3c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 14 Dec 2023 16:25:56 +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-[=E5=90=84=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=B8=BB=E7=AE=A1=E7=BA=A7=E9=A2=86=E5=AF=BC=E4=B8=8B?=
 =?UTF-8?q?=E5=8F=91]=E6=9F=A5=E8=AF=A2=E6=B5=81=E7=A8=8B=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fb/service/impl/ProcessHandleServiceImpl.java    |  7 +++----
 .../mapper/xml/ProcessProjectAssessTermMapper.xml    |  5 ++++-
 .../service/ProcessProjectAssessService.java         | 12 ++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
index a23fc802..0c7c575c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+++ b/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())) {
-            throw new JeroBootException(ResultCommon.NO_PERMISSION);
-        }
+        //if (!CurrentUserUtil.getId().equals(task.getAssignee())) {
+        //    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());
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 0ebbf3a0..ef6fd994 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
@@ -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
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 fef284b7..44411a9f 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
@@ -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) {