From 96545f502e8ca5a93d3f0639da9c66dd717fcc86 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 16:24:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E9=BB=84=E7=BB=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/result/ItemAppealPageResultDTO.java  | 25 +++++++++++++++++++
 .../item/service/impl/ItemServiceImpl.java    |  7 +++++-
 .../main/resources/mapper/item/ItemDao.xml    |  5 ++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
index ccbfcdde6..38d2dd119 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java
+++ b/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;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 432fb15de..0a80a8816 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/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);
         }
     }
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index cac549f2d..ebb559ca1 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/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,