From 98f37dcbdcdd0cd0b9a2c6960c51c1df42c650cd Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Thu, 12 Oct 2023 14:38:02 +0800
Subject: [PATCH] =?UTF-8?q?perf(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=97=E8=A1=A8=E9=A1=B5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../split/entity/SarFileSplitInfoEO.java      |  3 +-
 .../impl/SarFileSplitInfoServiceImpl.java     | 33 ++++---------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
index c6a734af..4e3906c2 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java
@@ -77,7 +77,7 @@ public class SarFileSplitInfoEO implements Serializable {
 
 	/**文本状态*/
     @Excel(name = "文本状态", width = 15, dicCode = "file_type")
-//    @Dict(dicCode = "file_type")
+    @Dict(dicCode = "file_type")
     @ApiModelProperty(value = "文本状态")
     private String fileType;
 
@@ -95,7 +95,6 @@ public class SarFileSplitInfoEO implements Serializable {
     /**编辑人*/
     @Excel(name = "编辑人", width = 15)
     @ApiModelProperty(value = "编辑人")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
     private String author;
 
 	/**拆分结果*/
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
index 7db83b03..1955a6eb 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java
@@ -34,8 +34,10 @@ import com.jero.modules.split.service.ISarFileSplitInfoService;
 import com.jero.modules.split.service.ISarFileSplitMenuEOService;
 import com.jero.modules.split.vo.SplitFilePageInfoParam;
 import com.jero.modules.system.entity.SysDictItem;
+import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysDictService;
+import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,6 +83,8 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
 	private ILawsEnterpriseStandardService ILawsEnterpriseStandardService; //企业标准
 	@Autowired
 	private ISysDictService sysDictService;
+	@Autowired
+	private ISysUserService sysUserService;
 
 
 	/**
@@ -263,33 +267,10 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl<SarFileSplitInfoMap
 
 		// 处理数据中所有下拉字典值
 		for (SarFileSplitInfoEO splitInfoEO : sarFileSplitInfoEOList){
-			String fileType = null;
-			OnlCgformField fileTypeField = onlCgformFieldService.queryById(splitInfoEO.getFileType());
-			if (ObjectUtil.isNotEmpty(fileTypeField)) {
-				if (LanguageEnum.CN.getValue().equals(cut)) {
-					fileType = fileTypeField.getDbFieldTxt();
-				} else {
-					fileType = fileTypeField.getDbFieldEnName();
-				}
-			}
-
-//			if (LanguageEnum.CN.getValue().equals(cut)) {
-//				Map<String, String> cnMap = dictItemListAll.stream()
-//						.filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult()))
-//						.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化
-//				splitInfoEO.setSplitResult(cnMap.get(splitInfoEO.getSplitResult()));
-//			} else {
-//				Map<String, String> enMap = dictItemListAll.stream()
-//						.filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult()))
-//						.collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getEnName)); // 优化
-//				splitInfoEO.setSplitResult(enMap.get(splitInfoEO.getSplitResult()));
-//			}
-			splitInfoEO.setFileType(fileType);
+			SysUser sysUser = sysUserService.getById(splitInfoEO.getAuthor());
+			splitInfoEO.setAuthor(sysUser.calcNameWorkNo());
+			splitInfoEO.setFileType(sysDictService.queryDictTextByKey("process_manuscript", splitInfoEO.getFileType()));
 			// 处理文档库id字段  根据编号和标题查询
-//			List<Map<String, Object>> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber());
-//			if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) {
-//				splitInfoEO.setDocumentId(bussDocumentLibraryEOList.get(0).get("id").toString());
-//			}
 			if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) {
 				splitInfoEO.setFlag("1");
 			}else{