红黄绿

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java

@@ -119,4 +119,29 @@ public class ItemAppealPageResultDTO implements Serializable {
      * 是否提醒社区处理(1:提示)
      */
     private String isRemind;
+
+    /**
+     * 创建时间距离当日结束还有几个小时，-17:00
+     */
+    private String createHour;
+
+    /**
+     * 今天实际工作几个小时，8:00-
+     */
+    private String todayHour;
+
+    /**
+     * 创建诉求后过了几天
+     */
+    private String days;
+
+    /**
+     * 创建诉求后过了几天
+     */
+    private String createWeek;
+
+    /**
+     * 今天是周几
+     */
+    private String todayWeek;
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -2837,7 +2837,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 ItemGridPlatformHandleStatusEnum.HANDLE_YQSQ.getValue() == dto.getState() ||
                 ItemGridPlatformHandleStatusEnum.HANDLE_SQBJ.getValue() == dto.getState() ||
                 ItemGridPlatformHandleStatusEnum.HANDLE_XSSQ.getValue() == dto.getState()) {
-            pushToCityGridService.appealReporting(dto.getId(), NumConstant.ONE_STR);
+
+//            pushToCityGridService.appealReporting(dto.getId(), NumConstant.ONE_STR);
+        }
+        // 网格化平台，处置完成
+        if (ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue() == dto.getState()) {
+            pushToCityGridService.appealHandling(dto);
         }
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -1723,6 +1723,11 @@
         SELECT i.id,
                 i.NICK_NAME,
                 i.CREATED_TIME,
+                TIMESTAMPDIFF(HOUR,i.CREATED_TIME,CONCAT(DATE_FORMAT(i.CREATED_TIME,'%Y-%m-%d'),' 17:00:00')) AS createHour,
+                TIMESTAMPDIFF(HOUR,CONCAT(DATE_FORMAT(now(),'%Y-%m-%d'),' 09:00:00'),NOW()) AS todayHour,
+                TIMESTAMPDIFF(DAY,i.CREATED_TIME,NOW()) AS days,
+                DAYOFWEEK(i.CREATED_TIME) AS createWeek,
+                DAYOFWEEK(NOW()) AS todayWeek,
                 i.ITEM_STATE,
                 i.SERIAL_NUM,
                 i.GRID as gridName,