From 8a161f9cab8aec75e998fc9007892832535941c8 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Tue, 23 Jan 2024 19:49:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=5F=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B):=208?=
 =?UTF-8?q?0628?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessFbEntryChangeServiceImpl.java | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 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 cf4e27ec..dd284272 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
@@ -34,9 +34,11 @@ import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.laws.standard.entity.LawsDomesticStandard;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.entity.LawsOverseasStandard;
+import com.jero.modules.laws.standard.entity.LawsTreeNode;
 import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.laws.standard.service.ILawsOverseasStandardService;
+import com.jero.modules.laws.standard.service.ILawsTreeNodeService;
 import com.jero.modules.laws.standardization.entity.LawsStandardization;
 import com.jero.modules.laws.standardization.service.ILawsStandardizationService;
 import com.jero.modules.system.entity.SysDepart;
@@ -103,6 +105,9 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
     @Resource
     private ProcessAllService processAllService;
 
+    @Resource
+    private ILawsTreeNodeService lawsTreeNodeService;
+
     /**
      * @Author: liao
      * @Date: 2023/11/2 15:43
@@ -538,10 +543,10 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
             jsonObject.put("bidding_committee_dictText", !Objects.isNull(lawsStandardization) ? lawsStandardization.getName() : "");
         }
         // 标准状态
-        if (businessJson.contains("standard_status")){
-            Object read = JSONPath.read(businessJson, "$.standard_status");
-            String text = dictService.queryDictText("standard_status", read.toString());
-            jsonObject.put("standard_status_dictText", text);
+        if (businessJson.contains("standard_state")){
+            Object read = JSONPath.read(businessJson, "$.standard_state");
+            String text = dictService.queryDictText("standard_state", read.toString());
+            jsonObject.put("standard_state_dictText", text);
         }
         // 标准性质
         if (businessJson.contains("standard_property")){
@@ -551,9 +556,15 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         }
         // 标准体系
         if (businessJson.contains("standard_system")){
+            List<String> dicTextList = new ArrayList<>();
             Object read = JSONPath.read(businessJson, "$.standard_system");
-            String text = dictService.queryDictText("standard_system", read.toString());
-            jsonObject.put("standard_system_dictText", text);
+            List<String> list = Arrays.asList(read.toString().split(","));
+            List<LawsTreeNode> lawsTreeNodeList = lawsTreeNodeService.listByIds(list);
+            for (String item : list) {
+                Optional<LawsTreeNode> optional = lawsTreeNodeList.stream().filter(v -> v.getId().equals(item)).findFirst();
+                optional.ifPresent(v -> dicTextList.add(v.getNodeName()));
+            }
+            jsonObject.put("standard_system_dictText", String.join(",", dicTextList));
         }
         // 责任部门
         if (businessJson.contains("responsible_department")){