From 4fea7066899ba62f8e980b34fb5d72498e0f04b9 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 20 May 2022 09:33:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AF=84=E4=BB=B7=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IcEventServiceImpl.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index 9ce3a4a9e4..307febd0f3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -969,7 +969,9 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             int start = (no - NumConstant.ONE) * size;
             ids = baseDao.getAutoEvaluationIds(customerId,start,size);
             // 批量更新
-            baseDao.updateAutoEvaluation(ids);
+            if (!CollectionUtils.isEmpty(ids)){
+                baseDao.updateAutoEvaluation(ids);
+            }
             no++;
         }while (ids.size() == size);
     }
@@ -1102,6 +1104,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         if (!CollectionUtils.isEmpty(attachmentEntityList)){
             icEventAttachmentService.insertBatch(attachmentEntityList);
         }
+        // 站内信发送给社区每个工作人员
+
     }
 
     public void disposeAttachment(List<FileCommonDTO> list,List<IcEventAttachmentEntity> attachmentEntityList,String id,String customerId,String userId){

From f97a7487912b2402ae41587fe9ce20d02db89db5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 20 May 2022 09:43:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/form/IcEventCategoryAnalysisFormDTO.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventCategoryAnalysisFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventCategoryAnalysisFormDTO.java
index 1c4b340ad5..e2dc625e6d 100644
--- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventCategoryAnalysisFormDTO.java
+++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventCategoryAnalysisFormDTO.java
@@ -38,16 +38,16 @@ public class IcEventCategoryAnalysisFormDTO {
     /**
      * 查询起始时间 yyyy-MM-dd
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "查询时间为必填项", groups = {TotalPie.class,OrgTotalPie.class})
     private Date queryStartTime;
 
     /**
      * 查询截止时间 yyyy-MM-dd
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "查询时间为必填项", groups = {TotalPie.class,OrgTotalPie.class})
     private Date queryEndTime;