From b00d4a2e5e61b8849320b89ae16151cb9e5556b0 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 31 Jan 2024 11:48:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080052=20=E5=B8=A6=E5=85=A5=E5=88=86?=
 =?UTF-8?q?=E8=A7=A3=E5=8D=95=E7=9A=84=E6=A0=87=E5=87=86=20=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=B2=A1=E6=9C=89=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DocumentSplitServiceImpl.java       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
index 8c89df58..0800aa70 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.laws.documenttool.service.impl;
 
+import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import com.alibaba.fastjson.JSON;
@@ -11,6 +12,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.constant.enums.LanguageEnum;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.system.api.ISysBaseAPI;
+import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.FileUtils;
 import com.jero.common.util.MessageUtils;
@@ -117,6 +120,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     private final ILawsGradeService lawsGradeService;
     private final PartNameService partNameService;
     private final ILawsLabelDatabaseService lawsLabelDatabaseService;
+    private final ISysBaseAPI sysBaseAPI;
     private static final String INFO_ID = "info_id";
     private static final String ID = "id";
     private static final String IDS = "ids";
@@ -145,7 +149,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
                                     ISysUserDepartService sysUserDepartService,
                                     ILawsGradeService lawsGradeService,
                                     PartNameService partNameService,
-                                    ILawsLabelDatabaseService lawsLabelDatabaseService) {
+                                    ILawsLabelDatabaseService lawsLabelDatabaseService,
+                                    ISysBaseAPI sysBaseAPI) {
         this.documentSplitMapper = documentSplitMapper;
         this.sarFileSplitInfoService = sarFileSplitInfoService;
         this.lawsCommonMapper = lawsCommonMapper;
@@ -164,6 +169,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         this.lawsGradeService = lawsGradeService;
         this.partNameService = partNameService;
         this.lawsLabelDatabaseService = lawsLabelDatabaseService;
+        this.sysBaseAPI = sysBaseAPI;
     }
 
     @Value("${jero.path.exportExcelTempPath}")
@@ -1033,6 +1039,8 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     @Override
     public List<ProcessProjectAssessTerm> processProjectAssessGetList(String ids) {
         List<ProcessProjectAssessTerm> processProjectAssessTermList = new ArrayList<>();
+        List<DictModel> processManuscriptDictModels = sysBaseAPI.queryDictItemsByCode("process_manuscript");
+        Map<String, String> processManuscriptMap = CollStreamUtil.toMap(processManuscriptDictModels, DictModel::getValue, DictModel::getText);
         for (String id : ids.split(",")) {
             ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm();
             // 文档拆分信息
@@ -1040,7 +1048,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             processProjectAssessTerm.setTermNumber(documentSplitInfo1.getSerialNumber());
             processProjectAssessTerm.setTermName(documentSplitInfo1.getTitle());
             processProjectAssessTerm.setSplitInfoId(id);
-            processProjectAssessTerm.setTermText(documentSplitInfo1.getFileType());
+            processProjectAssessTerm.setTermText(processManuscriptMap.get(documentSplitInfo1.getFileType()));
             processProjectAssessTerm.setCanAssignFlag(YesOrNoEnum.NO.getInteger());
             processProjectAssessTermList.add(processProjectAssessTerm);
             // 文档拆分详情