From fa1ad604eef464e4847241751f8c139d06bf5bf3 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 18 Dec 2023 17:47:51 +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=20=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=A0=87=E9=A2=98=E8=BF=94=E5=9B=9E=E5=88=86?=
 =?UTF-8?q?=E8=A7=A3=E5=8D=95=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectAssessService.java              | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 211c5e5f..3b979363 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
@@ -212,7 +212,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             default:
         }
         List<DictModel> dictModels = sysBaseAPI.queryDictItemsByCode("assess_results");
-        Map<String, String> dictMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
+        Map<String, String> dictevaluationFeedbackMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
         //给条款中保存关联的信息
         if (!processProjectAssessTermUserList.isEmpty()) {
             Map<String, List<ProcessProjectAssessTermUser>> termIdListMap = CollStreamUtil.groupByKey(processProjectAssessTermUserList, ProcessProjectAssessTermUser::getTermId);
@@ -222,7 +222,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 if (CollectionUtil.isNotEmpty(termUsers)){
                     for (ProcessProjectAssessTermUser termUser : termUsers) {
                         String evaluationFeedback = termUser.getEvaluationFeedback();
-                        termUser.setEvaluationFeedback_dictText(dictMap.get(evaluationFeedback));
+                        termUser.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback));
                     }
                     ProcessProjectAssessTermUser termUser = termUsers.get(0);
                     term.setEvaluationFeedback(termUser.getEvaluationFeedback());
@@ -238,6 +238,8 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             }
         }
         //拼接分类法规标题
+        List<DictModel> decompositionOrderSourceDictModels = sysBaseAPI.queryDictItemsByCode("decomposition_order_source");
+        Map<String, String> decompositionOrderSourceMap = CollStreamUtil.toMap(dictModels, DictModel::getValue, DictModel::getText);
         Map<String, ProcessProjectAssessTerm> splitInfoIdMap = processProjectAssessTermService.getSplitInfoIdMap(assessmentId);
         List<ProcessProjectAssessTerm> allProjectAssesTermList = new ArrayList<>();
         List<String> usedSplitInfoId = new ArrayList<>();
@@ -249,7 +251,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
                 ProcessProjectAssessTerm term1 = new ProcessProjectAssessTerm();
                 term1.setTermName(titleTerm.getTermName());
                 term1.setTermNumber(titleTerm.getTermNumber());
-                term1.setTermText(titleTerm.getTermText());
+                term1.setTermText(decompositionOrderSourceMap.get(titleTerm.getTermText()));
                 term1.setCanAssignFlag(YesOrNoEnum.NO.getInteger());
                 allProjectAssesTermList.add(term1);
             }