From af5d96a928663a3c1a1fb3429172f8580c34984b Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Wed, 23 Mar 2022 17:59:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BussDocumentLibraryEOServiceImpl.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index fcab7162f..a977b5a74 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -974,6 +974,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         List<OnlCgformField> searchFieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(e.getIsShowSearch())).collect(Collectors.toList());
         //文件类型字段
         List<OnlCgformField> fieldFileList = fieldList.stream().filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+        //日期类型字段
+        List<OnlCgformField> onlCgformFieldList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_SINGLE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList());
+        List<String> fieldDateList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList());
         //树形数据字典
         List<SysCategory> categoryList = sysCategoryService.list();
         //普通数据字典
@@ -999,14 +1002,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 //es全文新增数据(数据转换)
                 esFullText(cut, fieldList, categoryList, dictItemList, mapList, sb, entry);
 
-                //处理发布日期,标准实施日期
-                if ("issue_time".equals(key) || "implement_time".equals(key)) {
-//                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                //处理日期格式
+                if(fieldDateList.contains(key)){
                     if (ObjectUtils.isNotEmpty(value)) {
                         value = "str_to_date('" + value + "','%Y-%m-%d')";
                     }
                     valuesBuilder.append("," + value);
-                } else {
+                }else {
                     //处理文件类型
                     List<OnlCgformField> fieldFile = null;
                     try {