From 24b336507f2b6ba1a4bd151b968d5181bb913412 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Tue, 21 Nov 2023 16:43:50 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessFbEntryChangeServiceImpl.java     | 11 ++++++-----
 .../ProcessFbStandardConsultationServiceImpl.java | 15 +++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
index 5ae0a678..66a4723e 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
@@ -223,13 +223,14 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         Map<String, Object> map = JSON.parseObject(processFbEntryChange.getBusinessJson(), Map.class);
 
         // 处理字典翻译
-        List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.getTableName(processFbEntryChange.getSource()));
+        //List<LawsTag> fieldList = lawsCommonMapper.getFieldList(TableNameEnum.getTableName(processFbEntryChange.getSource()));
         // 新增编辑显示
-        fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue()
-                .equals(lawsTag.getIsShowFormCreate().toString())).collect(Collectors.toList());
-        Map<String, Object> stringObjectMap = lawsCommonService.processResultMap(map, fieldList);
+        //fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getValue()
+                //.equals(lawsTag.getIsShowFormCreate().toString())).collect(Collectors.toList());
+        //Map<String, Object> stringObjectMap = lawsCommonService.processResultMap(map, fieldList);
 
-        processFbEntryChange.setBusinessMap(stringObjectMap);
+        //processFbEntryChange.setBusinessMap(stringObjectMap);
+        processFbEntryChange.setBusinessMap(map);
         processInfoVO.setBusinessInfoDTO(processFbEntryChange);
         return processInfoVO;
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
index e8597d47..88912fb4 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
@@ -203,11 +203,13 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
             case ConsultationTaskKey.DEPART_LEADER_START_1:
                 processDepartLeaderStart_1(processInfoVO); // 各部所主管级领导分发
                 break;
+            case ConsultationTaskKey.DESIGN_ENGINEER_1: // 设计工程师填写征求意见（分发给模块负责人）
             case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见（不分发给模块负责人）
-                processEngineer_2(processInfoVO);
+                designEngineer(processInfoVO);
                 break;
+            case ConsultationTaskKey.MODULE_OWNER_END_1: // 模块负责人汇总填写意见（可跳过）
             case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总（不分发给模块负责人）
-                departLeaderCollect_2(processInfoVO);
+                collect(processInfoVO);
                 break;
             case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发
                 moduleOwnerStart(processInfoVO);
@@ -242,6 +244,7 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
 
         designEngineerIdList.forEach(designEngineer -> {
             ProcessFbConsultationUserLink userLink = new ProcessFbConsultationUserLink();
+            userLink.setId(UUIDUtils.randomUUID20());
             userLink.setUserType(processFbConsultationUserLink.getUserType());
             userLink.setBusinessId(processFbConsultationUserLink.getBusinessId());
             userLink.setDepartLeaderId(processFbConsultationUserLink.getDepartLeaderId());
@@ -265,9 +268,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
     /**
      * @Author: liao
      * @Date: 2023/11/21 9:39
-     * @Description: 各部所主管级领导汇总（不分发给模块负责人）
+     * @Description: 汇总
      **/
-    private void departLeaderCollect_2(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
+    private void collect(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
         ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息
         List<ProcessFbConsultationList> processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists();
 
@@ -284,9 +287,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
     /**
      * @Author: liao
      * @Date: 2023/11/16 15:46
-     * @Description: 设计工程师填写征求意见（不分发给模块负责人）
+     * @Description: 设计工程师填写征求意见
      **/
-    private void processEngineer_2(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
+    private void designEngineer(ProcessInfoVO<ProcessFbStandardConsultationVO> processInfoVO) {
         ProcessFbStandardConsultationVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); // 全部业务信息
         List<ProcessFbConsultationList> processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists();