From b7540882f094164b5e417254f714b96a4a712266 Mon Sep 17 00:00:00 2001
From: wangzhijiang <1358525938@qq.com>
Date: Thu, 8 Jun 2023 09:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF-=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83-=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5-?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=9B=E5=BB=BA=E4=BA=BA=E3=80=81=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsMonthlyReportManageEOServiceImpl.java   | 12 +++++++-----
 .../impl/LawsMonthlyReportSearchServiceImpl.java     |  3 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
index 992260cd6..3a4660935 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java
@@ -192,20 +192,20 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 			//文件相关封装中文的全文内容(es) 非搜索条件下的：flag---SEARCH_FLAG
 			putMap(id, "法规月报",
 					fileText, monthlyReportManageEO.getName(),
-					ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCn, SEARCH_FLAG);
+					ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCn, SEARCH_FLAG,monthlyReportManageEO);
 			//文件相关封装英文的全文内容(es)
 			putMap(id, "monthly report",
 					fileText, monthlyReportManageEO.getName(),
-					ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEn, SEARCH_FLAG);
+					ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEn, SEARCH_FLAG,monthlyReportManageEO);
 
 			//文件相关封装中文的全文内容(es) 搜索条件下的: flag---null
 			putMap(id + monthlyReportManageEO.getFileId(), "法规月报",
 					fileText, monthlyReportManageEO.getName(),
-					ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCnForSearch, null);
+					ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.CN.getValue(), stringMapCnForSearch, null,monthlyReportManageEO);
 			//文件相关封装英文的全文内容(es)
 			putMap(id + monthlyReportManageEO.getFileId(), "monthly report",
 					fileText, monthlyReportManageEO.getName(),
-					ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEnForSearch, null);
+					ossFile.getFileName(), ossFile.getId(), issueTime, CutEnum.EN.getValue(), stringMapEnForSearch, null,monthlyReportManageEO);
 
 			mapListTempCn.add(stringMapCn);
 			mapListTempCn.add(stringMapCnForSearch);
@@ -250,7 +250,8 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 						  String content, String title ,
 						  String fileName, String fileId, Date issueTime, String cut,
 						  Map<String, Object> stringMap,
-						  String flag){
+						  String flag,
+						  LawsMonthlyReportManageEO monthlyReportManageEO){
 		stringMap.put("id", id);
 		stringMap.put("module_type", moduleType);
 		stringMap.put("module_type_flag", ModuleTypeFlagEnum.LAWS_MONTHLY_REPORT.getValue()); // 默认法规月报标识
@@ -259,6 +260,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 		stringMap.put("file_name", fileName);
 		stringMap.put("file_id", fileId);
 		stringMap.put("create_time", issueTime);
+		stringMap.put("create_by", monthlyReportManageEO.getCreateBy());
 		stringMap.put("cut",cut);
 		stringMap.put("flag",flag);
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java
index 960f55799..f18205133 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/LawsMonthlyReportSearchServiceImpl.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.es.JeroElasticsearchTemplate;
+import com.jero.common.util.DateUtils;
 import com.jero.modules.document.enums.SearchEnum;
 import com.jero.modules.searchcenter.service.ILawsMonthlyReportSearchService;
 import com.jero.modules.searchcenter.vo.SearchVO;
@@ -211,6 +212,8 @@ public class LawsMonthlyReportSearchServiceImpl implements ILawsMonthlyReportSea
                     mapSource.put(key,fieldConyent);
                 }
             }
+            Long create_time = (Long) mapSource.get("create_time");
+            mapSource.put("create_time_str", DateUtils.formatTime(create_time));
             mapList.add(mapSource);
         }