Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili

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;
 

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -968,7 +968,9 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             int start = (no - NumConstant.ONE) * size;
             ids = baseDao.getAutoEvaluationIds(customerId,start,size);
             // 批量更新
+            if (!CollectionUtils.isEmpty(ids)){
                 baseDao.updateAutoEvaluation(ids);
+            }
             no++;
         }while (ids.size() == size);
     }
@@ -1101,6 +1103,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){