From 0ab91e25725afb2eef660a80a1b807110b0ff7a1 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 10 Oct 2022 11:59:43 +0800
Subject: [PATCH 01/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/item/service/impl/ItemServiceImpl.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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 4d3c4a8da..e61bcabe8 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
@@ -2298,7 +2298,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
         //查询所对应的大类
         CategoryEntity thirdCate = categoryDao.selectById(thirdId);
-        if (null == thirdCate) {
+        if (null == thirdCate || StringUtils.isBlank(thirdCate.getEventCategoryCode())) {
             sendDto.setSJLYU("21");
             sendDto.setSJDL("2199");
             return;
@@ -2309,6 +2309,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
     }
 
+    public static void main(String[] args) {
+        String pids = "3,32,234";
+        String thirdId = "";
+        if (StrUtil.ordinalIndexOf(pids, ",", 2) != -1 && StrUtil.ordinalIndexOf(pids, ",", 3) != -1) {
+            thirdId = pids.substring(StrUtil.ordinalIndexOf(pids, ",", 2) + 1, StrUtil.ordinalIndexOf(pids, ",", 3));
+            //只有第二个逗号，没有第三个逗号
+        } else if (StrUtil.ordinalIndexOf(pids, ",", 2) != -1 && StrUtil.ordinalIndexOf(pids, ",", 3) == -1) {
+            thirdId = pids.substring(StrUtil.ordinalIndexOf(pids, ",", 2) + 1);
+        }
+        System.out.println(thirdId);
+    }
+
     /**
      * @return com.elink.esua.epdc.gird.shibei.dto.form.EventRejectReDoFormDto
      * @describe: 组装驳回重办数据

From b1f5eded4cce4fb4364b4b1614e3c1a47b66f13c Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 10 Oct 2022 12:13:40 +0800
Subject: [PATCH 02/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/item/service/impl/ItemServiceImpl.java   | 12 ------------
 1 file changed, 12 deletions(-)

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 e61bcabe8..624e2a4a4 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
@@ -2309,18 +2309,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
     }
 
-    public static void main(String[] args) {
-        String pids = "3,32,234";
-        String thirdId = "";
-        if (StrUtil.ordinalIndexOf(pids, ",", 2) != -1 && StrUtil.ordinalIndexOf(pids, ",", 3) != -1) {
-            thirdId = pids.substring(StrUtil.ordinalIndexOf(pids, ",", 2) + 1, StrUtil.ordinalIndexOf(pids, ",", 3));
-            //只有第二个逗号，没有第三个逗号
-        } else if (StrUtil.ordinalIndexOf(pids, ",", 2) != -1 && StrUtil.ordinalIndexOf(pids, ",", 3) == -1) {
-            thirdId = pids.substring(StrUtil.ordinalIndexOf(pids, ",", 2) + 1);
-        }
-        System.out.println(thirdId);
-    }
-
     /**
      * @return com.elink.esua.epdc.gird.shibei.dto.form.EventRejectReDoFormDto
      * @describe: 组装驳回重办数据

From b48b2eaad0bd3819a0609f228b690dfff13e88b2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 10 Oct 2022 14:21:14 +0800
Subject: [PATCH 03/27] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=89=E4=B8=AA=E4=B8=8D=E6=BB=A1=E6=84=8F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/item/ItemPendingHandleDTO.java   |  5 +
 .../item/controller/ItemController.java       | 13 +++
 .../esua/epdc/modules/item/dao/ItemDao.java   |  9 ++
 .../modules/item/service/ItemService.java     |  9 ++
 .../item/service/impl/ItemServiceImpl.java    | 17 ++++
 .../main/resources/mapper/item/ItemDao.xml    | 96 +++++++++++++++++++
 6 files changed, 149 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java
index c2de40a42..0a360513e 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java
@@ -75,6 +75,11 @@ public class ItemPendingHandleDTO implements Serializable {
      */
     private String isRemind;
 
+    /**
+     * 剩余小时数
+     */
+    private Integer remainTime;
+
     /**
      * 头像
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
index 4dfb8daba..c15910e6f 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
@@ -349,6 +349,19 @@ public class ItemController {
         return new Result<PageData<ItemAppealPageResultDTO>>().ok(page);
     }
 
+    /**
+     * @describe: 北尚诉求列表(不满意列表)
+     * @author wgf
+     * @date 2022/10/10 08:39
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
+     */
+    @GetMapping("getItemAppealPageUnsatisfactory")
+    public Result<PageData<ItemAppealPageResultDTO>> getItemAppealPageUnsatisfactory(@RequestParam Map<String, Object> params){
+        PageData<ItemAppealPageResultDTO> page = itemService.getItemAppealPageUnsatisfactory(params);
+        return new Result<PageData<ItemAppealPageResultDTO>>().ok(page);
+    }
+
     /**
     * @describe: 北尚诉求详情
     * @author wangtong
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
index b9b3fca04..652b89f65 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
@@ -408,6 +408,15 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      */
     List<ItemAppealPageResultDTO> getItemAppealPage(Map<String, Object> params);
 
+    /**
+     * @describe: 北尚诉求列表(不满意列表)
+     * @author wgf
+     * @date 2022/10/10 08:39
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
+     */
+    List<ItemAppealPageResultDTO> getItemAppealPageUnsatisfactory(Map<String, Object> params);
+
     /**
      * @return com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO
      * @describe: 北尚诉求详情
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
index f00387c19..e92c4c20e 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
@@ -542,6 +542,15 @@ public interface ItemService extends BaseService<ItemEntity> {
      */
     PageData<ItemAppealPageResultDTO> getItemAppealPage(Map<String, Object> params);
 
+    /**
+     * @describe: 北尚诉求列表(不满意列表)
+     * @author wgf
+     * @date 2022/10/10 08:39
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO>>
+     */
+    PageData<ItemAppealPageResultDTO> getItemAppealPageUnsatisfactory(Map<String, Object> params);
+
     /**
      * @describe: 北尚诉求详情
      * @author wangtong
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 ba5a8bfed..921b9573a 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
@@ -3463,6 +3463,23 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     }
 
+    @Override
+    public PageData<ItemAppealPageResultDTO> getItemAppealPageUnsatisfactory(@RequestParam Map<String, Object> params) {
+        UserDetail user = SecurityUser.getUser();
+        //部门ID列表
+        List<Long> deptIdList = user.getDeptIdList();
+        params.put("deptIdList", null);
+        if (null != deptIdList && deptIdList.size() > 0) {
+            params.put("deptIdList", deptIdList);
+        }
+        IPage<ItemAppealPageResultDTO> page = getPage(params);
+        List<ItemAppealPageResultDTO> list = baseDao.getItemAppealPageUnsatisfactory(params);
+        Map<String, Long> map = listItemHandleDept();
+        list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId())));
+        return new PageData<>(list, page.getTotal());
+
+    }
+
     @Override
     public Result<ItemAppealDetailResultDTO> getItemAppealDetail(String id) {
         ItemAppealDetailResultDTO result = baseDao.getItemAppealDetail(id);
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 926902441..24fd64c81 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
@@ -1812,6 +1812,102 @@
         </if>
         order by i.CREATED_TIME desc
     </select>
+
+    <select id="getItemAppealPageUnsatisfactory" resultType="com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO">
+        SELECT i.id,
+        i.NICK_NAME,
+        i.CREATED_TIME,
+        i.ITEM_STATE,
+        i.SERIAL_NUM,
+        i.GRID as gridName,
+        SUBSTRING_INDEX(REPLACE(i.PARENT_DEPT_NAMES,'市北区委-',''),'-',1) as streetName,
+        SUBSTRING_INDEX(REPLACE(i.PARENT_DEPT_NAMES,'市北区委-',''),'-',-1) as communityName,
+        CASE i.ITEM_STATE
+        WHEN '0' THEN '处理中'
+        WHEN '10' THEN '已结案'
+        ELSE ''
+        END AS itemStateName,
+        i.ITEM_CONTENT,
+        i.PEOPLE_FLAG,
+        CASE i.PEOPLE_FLAG
+        WHEN '0' THEN '民生诉求'
+        WHEN '1' THEN '发展诉求'
+        WHEN '2' THEN '执法诉求'
+        ELSE ''
+        END AS peopleFlagName,
+        i.EVALUATION_SCORE,
+        case i.EVALUATION_SCORE
+        when '0' then '不满意'
+        when '1' then '基本满意'
+        when '2' then '非常满意'
+        else ''
+        end as evaluationScoreName,
+        i.EVALUATION_CONTENT,
+        i.EVALUATION_TIME,
+        (case when (process.STATE = 1001 and HOUR( timediff( now(), i.CREATED_TIME) ) >= 24) then '1' else '' end) as isRemind
+        FROM epdc_item i
+        left join (
+            select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state
+            from epdc_item_handle_process b
+            where b.DEL_FLAG = '0'
+            and b.CREATED_TIME = (
+            SELECT
+            max(CREATED_TIME)
+            from epdc_item_handle_process
+            where b.ITEM_ID = ITEM_ID
+            and DEL_FLAG = '0'
+            )
+            and (b.HANDLER_DEPT != '网格化平台' or (b.HANDLER_DEPT = '网格化平台' and b.STATE in (1060,1065)))
+        ) process on process.ITEM_ID = i.ID
+        where
+        i.DEL_FLAG='0'
+        and i.EVALUATION_SCORE = '0'
+        and IS_PEOPLE = '1'
+        <if test="appealType != null and appealType != ''">
+            and i.PEOPLE_FLAG = #{appealType}
+        </if>
+        <if test="itemState != null and itemState != ''">
+            and i.ITEM_STATE = #{itemState}
+        </if>
+        <if test="deptIdList != null and deptIdList.size() > 0">
+            AND i.GRID_ID IN
+            <foreach collection="deptIdList" index="index" item="deptId" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+        <if test="gridId != null and gridId != ''">
+            AND (i.GRID_ID = #{gridId}
+            OR find_in_set(#{gridId},i.ALL_DEPT_IDS))
+        </if>
+        <if test="streetId != null and streetId != ''">
+            AND (i.GRID_ID = #{streetId}
+            OR find_in_set(#{streetId},i.ALL_DEPT_IDS))
+        </if>
+        <if test="communityId != null and communityId != ''">
+            AND (find_in_set(#{communityId},i.PARENT_DEPT_IDS)
+            OR find_in_set(#{communityId},i.ALL_DEPT_IDS))
+        </if>
+        <if test="userId != null and userId != ''">
+            and i.USER_ID = #{userId}
+        </if>
+        <if test="mobile != null and mobile != ''">
+            and i.MOBILE = #{mobile}
+        </if>
+        <if test="itemContent != null and itemContent != ''">
+            and i.ITEM_CONTENT like '%${itemContent}%'
+        </if>
+        <if test="serialNum != null and serialNum != ''">
+            and i.SERIAL_NUM like '%${serialNum}%'
+        </if>
+        <if test="evaluationScore != null and evaluationScore != ''">
+            and i.EVALUATION_SCORE = #{evaluationScore}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( i.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        order by i.CREATED_TIME desc
+    </select>
+
     <resultMap id="appealDetailMap" type="com.elink.esua.epdc.dto.item.result.ItemAppealDetailResultDTO">
         <result property="id" column="ID"/>
         <result property="nickName" column="NICK_NAME"/>

From 69119af5b073132d9650caa7602465ab571bf1e5 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Mon, 10 Oct 2022 16:49:04 +0800
Subject: [PATCH 04/27] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ScreenItemController.java      | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
new file mode 100644
index 000000000..00ad57f7d
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.modules.screen.service.ScreenItemDeptStatisDailyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 项目统计相关接口
+ */
+@RestController
+@RequestMapping("itemstatis")
+public class ScreenItemController {
+
+    @Autowired
+    private ScreenItemDeptStatisDailyService screenItemDeptStatisDailyService;
+
+
+
+    /**
+     * 项目部门日统计表
+     *
+     * @return
+     */
+    @PostMapping
+    public Result save() {
+
+        return new Result();
+    }
+
+
+}

From 93ab8c9aefe2b3fd9b5f4d500861796435aa1c78 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 10 Oct 2022 16:50:09 +0800
Subject: [PATCH 05/27] =?UTF-8?q?=E8=AF=89=E6=B1=82=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 de91b3d53..e5560821c 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
@@ -3653,7 +3653,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public String getSerialNum(String prefix) {
         String serialNum = prefix;
         String dateStr = DateUtils.format(new Date(), DateUtils.DATE_TIME);
-        serialNum = serialNum + dateStr + "-";
+        serialNum = serialNum + "-" + dateStr + "-";
 
         String key = RedisKeys.getSerialNumKey(serialNum);
         String numStr;

From a6be82f2384043e05264dcd76259beef2d0a0cf8 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 10 Oct 2022 17:47:26 +0800
Subject: [PATCH 06/27] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=89=A7=E6=B3=95?=
 =?UTF-8?q?=E5=8F=91=E5=B1=95=E7=9A=84alldeptid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/service/impl/ItemServiceImpl.java    | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

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 e5560821c..a5c315822 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
@@ -508,6 +508,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemEntity.setDistributeTime(new Date());
         itemEntity.setGrid("执法诉求" + userDetail.getDeptName());
         itemEntity.setGridId(userDetail.getDeptId());
+
+        Result<SysDeptDTO> deptResult = adminFeignClient.getSysDeptInfo(userDetail.getDeptId());
+        if (deptResult.success()) {
+            // 因为是街道账号，所以上级一定是市北区委
+            Long pids = deptResult.getData().getId();
+            String pnames = deptResult.getData().getName();
+            itemEntity.setParentDeptIds(pids + "");
+            itemEntity.setParentDeptNames(pnames);
+            itemEntity.setAllDeptIds(pids + "," + userDetail.getDeptId());
+            itemEntity.setAllDeptNames(pnames + "-" + userDetail.getDeptName());
+        }
+
         itemEntity.setItemContent(formDto.getLawContent());
         itemEntity.setItemVoice(formDto.getItemVoice());
         itemEntity.setDuration(formDto.getDuration());
@@ -1272,12 +1284,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemHandleProgressResultDTO> listOfItemHandleProgressByMobile(String itemId) {
         List<ItemHandleProgressResultDTO> list = baseDao.selectListOfItemHandleProgressByMobile(itemId);
         // 处理多次拼接处理人信息问题
-        for(ItemHandleProgressResultDTO dto : list){
+        for (ItemHandleProgressResultDTO dto : list) {
             String advice = dto.getAdvice();
             // 对包含【h_s】的数据进行重新组装
-            if(advice.contains("h_s")){
-                String hsStr = advice.substring(advice.indexOf("h_s"),advice.length());
-                String adviceOld = advice.substring(0,advice.indexOf("   办理人："));
+            if (advice.contains("h_s")) {
+                String hsStr = advice.substring(advice.indexOf("h_s"), advice.length());
+                String adviceOld = advice.substring(0, advice.indexOf("   办理人："));
                 String adviceNew = adviceOld + hsStr;
                 dto.setAdvice(adviceNew);
             }
@@ -2136,7 +2148,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      */
     private SendEventFormDto packageSendEventEntity(ItemEntity itemEntity, ItemHandleSubmitFormDTO dto) throws Exception {
         SendEventFormDto sendDto = new SendEventFormDto();
-        SendInputInfoFormDto formDto = new SendInputInfoFormDto();
+
         //推送类别（事件上报）
         sendDto.setSENDTYPE(CommonConstants.SEND_TYPE);
         //上报
@@ -2165,6 +2177,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             SysDeptDTO deptInfo = streetResult.getData();
             if (deptInfo == null) {
                 throw new RenException("根据街道ID获取对应的街道编码失败" + streetResult.getMsg());
+            } else {
+                // 因为是街道账号，所以上级一定是市北区委
+                Long pids = deptInfo.getId();
+                String pnames = deptInfo.getName();
+                itemEntity.setParentDeptIds(pids + "");
+                itemEntity.setParentDeptNames(pnames);
+                itemEntity.setAllDeptIds(pids + "," + itemEntity.getGridId());
+                itemEntity.setAllDeptNames(pnames + "-" + itemEntity.getGrid());
             }
             //所属街道
             sendDto.setSSJD(deptInfo.getAreaCode());

From 820941aad87cec34cb207e19e05096d062edaa7d Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 11 Oct 2022 08:45:18 +0800
Subject: [PATCH 07/27] ..

---
 .../modules/screen/service/ScreenService.java | 27 ++++++++++++++++
 .../service/impl/ScreenServiceImpl.java       | 31 +++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
new file mode 100644
index 000000000..92b23793a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.service;
+
+/**
+ * 项目部门日统计表
+ */
+public interface ScreenService {
+
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
new file mode 100644
index 000000000..43ce157f5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.service.impl;
+
+import com.elink.esua.epdc.modules.screen.service.ScreenService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目部门日统计表
+ */
+@Service
+public class ScreenServiceImpl implements ScreenService {
+
+
+
+}

From 27af7e3272ec59137b05a8174b47464f2b1a2938 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 11 Oct 2022 08:46:09 +0800
Subject: [PATCH 08/27] .

---
 .../src/main/java/com/elink/esua/epdc/modules/screen/.gitkeep | 0
 .../epdc/modules/screen/controller/ScreenItemController.java  | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/.gitkeep

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/.gitkeep b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
index 00ad57f7d..69778b827 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
@@ -18,7 +18,7 @@
 package com.elink.esua.epdc.modules.screen.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.modules.screen.service.ScreenItemDeptStatisDailyService;
+import com.elink.esua.epdc.modules.screen.service.ScreenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class ScreenItemController {
 
     @Autowired
-    private ScreenItemDeptStatisDailyService screenItemDeptStatisDailyService;
+    private ScreenService screenService;
 
 
 

From 8358494e4cad5696ce23f757e2b37d7c6100ac13 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 09:21:03 +0800
Subject: [PATCH 09/27] =?UTF-8?q?=E4=BD=BF=E7=94=A8Ren=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=8D=95=E8=8E=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ItemFusingDelayServiceImpl.java      |  2 +-
 .../item/service/impl/ItemServiceImpl.java    | 33 ++++++++++---------
 .../service/impl/ItemTimeoutServiceImpl.java  |  5 +--
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java
index b8cc42811..108ecbedc 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java
@@ -77,7 +77,7 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl<ItemFusingDelayD
     public PageData<ItemHandleListDTO> page(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
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 a5c315822..2aff86c6c 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
@@ -228,7 +228,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public PageData<ItemPendingHandleDTO> listOfItemsForPCEnd(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
@@ -273,7 +273,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemPendingHandleDTO> listEqPc(ItemWorkListFormDTO formDTO) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) {
@@ -318,7 +318,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public PageData<ItemPendingHandleDTO> listOfItemsForPCReject(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
@@ -358,7 +358,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemPendingHandleDTO> rejectListEqPc(ItemWorkListFormDTO formDTO) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) {
@@ -488,11 +488,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public Result submitLawItem(ItemLawSubmitDTO formDto) {
         UserDetail userDetail = SecurityUser.getUser();
         if (null == userDetail) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (!(StringUtils.isNotBlank(userDetail.getTypeKey())
                 && OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(userDetail.getTypeKey()))) {
-            throw new RuntimeException("请用街道账号进行上报");
+            throw new RenException("请用街道账号进行上报");
         }
         ItemEntity itemEntity = new ItemEntity();
         /**
@@ -1916,7 +1916,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         ItemWorkListFormDTO formDTO = new ItemWorkListFormDTO();
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) {
@@ -2170,7 +2170,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 //事件来源
                 sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_ZF);
                 //备注
-                sendDto.setBZXX(getItemLawNote(itemEntity.getId()));
+                sendDto.setBZXX(getItemLawNote(itemEntity.getId(), itemEntity.getSerialNum()));
             }
             //执法诉求和发展诉求gridId存的是街道id,需要单独查
             Result<SysDeptDTO> streetResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId());
@@ -2206,7 +2206,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             log.info("上报网格化平台dto：" + dto);
             sendDto.setBZXX(dto.getHandleAdvice());
             if (StringUtils.isNotBlank(dto.getHandleAdviceRemark())) {
-                sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark());
+                sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark()+ "\n诉求编码：" + itemEntity.getSerialNum());
             }
             Result<DeptInfoCodeDTO> deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId());
 
@@ -2357,13 +2357,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return result;
     }
 
-    private String getItemLawNote(String itemId) {
+    private String getItemLawNote(String itemId, String serialNum) {
         QueryWrapper<ItemLawEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("item_id", itemId);
         wrapper.eq("del_flag", "0");
         ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper);
         String result = "主办单位：" + itemLaw.getHostUnit() + "\n\n"
-                + "协办单位：" + itemLaw.getAssistUnit();
+                + "协办单位：" + itemLaw.getAssistUnit() + "\n\n"
+                + "诉求编码：" + serialNum;
         return result;
     }
 
@@ -3368,7 +3369,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemPendingHandleDTO> unExportList(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
@@ -3408,7 +3409,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemPendingHandleDTO> rejectUnexport(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
@@ -3533,7 +3534,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public PageData<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         params.put("deptId", user.getDeptId());
         IPage<ItemExaminePageResultDTO> page = getPage(params);
@@ -3548,7 +3549,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         formDTO.setDeptId(user.getDeptId());
         List<ItemExaminePageResultDTO> list = baseDao.getExaminePageEqPc(formDTO);
@@ -3560,7 +3561,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public Result examineCase(ExamineCaseFormDTO formDto) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
 
         ItemHandleProcessEntity process = new ItemHandleProcessEntity();
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java
index 1a1c9c36f..4880791cb 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java
@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
@@ -115,7 +116,7 @@ public class ItemTimeoutServiceImpl extends BaseServiceImpl<ItemTimeoutDao, Item
     public PageData<ItemTimeOutDTO> listOfItemsForPCEnd(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
@@ -172,7 +173,7 @@ public class ItemTimeoutServiceImpl extends BaseServiceImpl<ItemTimeoutDao, Item
     public List<ItemTimeOutDTO> itemOutExportList(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {

From ff66718164abe2b7e040041c548022775f4f4eb3 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 09:36:29 +0800
Subject: [PATCH 10/27] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E7=9A=84=E7=88=B6=E7=BA=A7dept?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issue/service/impl/IssueServiceImpl.java  |  5 ++-
 .../item/service/impl/ItemServiceImpl.java    | 41 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
index 9e642f524..bcfaff473 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java
@@ -472,10 +472,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         itemEntity.setPeopleFlag("0");//民生诉求
         //民生诉求所属网格对应的所属社区的市中心编码
         Result<CompleteDeptDTO> result = adminFeignClient.getCompleteDept(issueEntity.getGridId());
-        if(!result.success()){
+        if (!result.success()) {
             throw new RenException(result.getMsg());
         }
-        itemEntity.setSerialNum(itemServiceImpl.getSerialNum("MS" + result.getData().getCommunityDisCenterZoningCode()));
+        String code = result.getData().getCommunityDisCenterZoningCode();
+        itemEntity.setSerialNum(itemServiceImpl.getSerialNum("MS" + code));
         return itemEntity;
     }
 
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 2aff86c6c..9e61cd653 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
@@ -509,17 +509,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemEntity.setGrid("执法诉求" + userDetail.getDeptName());
         itemEntity.setGridId(userDetail.getDeptId());
 
-        Result<SysDeptDTO> deptResult = adminFeignClient.getSysDeptInfo(userDetail.getDeptId());
-        if (deptResult.success()) {
-            // 因为是街道账号，所以上级一定是市北区委
-            Long pids = deptResult.getData().getId();
-            String pnames = deptResult.getData().getName();
-            itemEntity.setParentDeptIds(pids + "");
-            itemEntity.setParentDeptNames(pnames);
-            itemEntity.setAllDeptIds(pids + "," + userDetail.getDeptId());
-            itemEntity.setAllDeptNames(pnames + "-" + userDetail.getDeptName());
-        }
-
         itemEntity.setItemContent(formDto.getLawContent());
         itemEntity.setItemVoice(formDto.getItemVoice());
         itemEntity.setDuration(formDto.getDuration());
@@ -540,8 +529,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if (!dtoResult.success()) {
             throw new RenException(dtoResult.getMsg());
         }
+
+        // 因为是街道账号，所以上级一定是市北区委
+        Long pids = dtoResult.getData().getPid();
+        String pnames = dtoResult.getData().getParentName();
+        itemEntity.setParentDeptIds(pids + "");
+        itemEntity.setParentDeptNames(pnames);
+        itemEntity.setAllDeptIds(pids + "," + userDetail.getDeptId());
+        itemEntity.setAllDeptNames(pnames + "-" + userDetail.getDeptName());
+
         // 流水号
-        itemEntity.setSerialNum(getSerialNum("ZF" + dtoResult.getData().getDisCenterZoningCode()));
+        String code = dtoResult.getData().getDisCenterZoningCode();
+        itemEntity.setSerialNum(getSerialNum("ZF" + code));
         baseDao.insert(itemEntity);
         //插入项目部门关联表
         itemDeptService.savePeopleSubmitInfo(itemEntity);
@@ -2177,14 +2176,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             SysDeptDTO deptInfo = streetResult.getData();
             if (deptInfo == null) {
                 throw new RenException("根据街道ID获取对应的街道编码失败" + streetResult.getMsg());
-            } else {
-                // 因为是街道账号，所以上级一定是市北区委
-                Long pids = deptInfo.getId();
-                String pnames = deptInfo.getName();
-                itemEntity.setParentDeptIds(pids + "");
-                itemEntity.setParentDeptNames(pnames);
-                itemEntity.setAllDeptIds(pids + "," + itemEntity.getGridId());
-                itemEntity.setAllDeptNames(pnames + "-" + itemEntity.getGrid());
             }
             //所属街道
             sendDto.setSSJD(deptInfo.getAreaCode());
@@ -2206,7 +2197,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             log.info("上报网格化平台dto：" + dto);
             sendDto.setBZXX(dto.getHandleAdvice());
             if (StringUtils.isNotBlank(dto.getHandleAdviceRemark())) {
-                sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark()+ "\n诉求编码：" + itemEntity.getSerialNum());
+                sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark() + "\n诉求编码：" + itemEntity.getSerialNum());
             }
             Result<DeptInfoCodeDTO> deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId());
 
@@ -3162,6 +3153,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if (!dtoResult.success()) {
                 code = dtoResult.getData().getDisCenterZoningCode();
             }
+            // 因为是街道账号，所以上级一定是市北区委
+            Long pids = dtoResult.getData().getPid();
+            String pnames = dtoResult.getData().getParentName();
+            entity.setParentDeptIds(pids + "");
+            entity.setParentDeptNames(pnames);
+            entity.setAllDeptIds(pids + "," + entity.getGrid());
+            entity.setAllDeptNames(pnames + "-" + entity.getGrid());
+
             entity.setSerialNum(getSerialNum("FZ" + code));
         }
         baseDao.insert(entity);

From 4af5b3887ae39b97f7341a4bf421a46b1866d6e5 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 09:51:46 +0800
Subject: [PATCH 11/27] bug

---
 .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 9e61cd653..8767c3543 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
@@ -3150,7 +3150,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         } else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) {
             //执法诉求所属街道的市中心编码
             Result<SysDeptDTO> dtoResult = adminFeignClient.getSysDeptInfo(entity.getGridId());
-            if (!dtoResult.success()) {
+            if (dtoResult.success()) {
                 code = dtoResult.getData().getDisCenterZoningCode();
             }
             // 因为是街道账号，所以上级一定是市北区委
@@ -3158,7 +3158,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             String pnames = dtoResult.getData().getParentName();
             entity.setParentDeptIds(pids + "");
             entity.setParentDeptNames(pnames);
-            entity.setAllDeptIds(pids + "," + entity.getGrid());
+            entity.setAllDeptIds(pids + "," + entity.getGridId());
             entity.setAllDeptNames(pnames + "-" + entity.getGrid());
 
             entity.setSerialNum(getSerialNum("FZ" + code));

From 3877420f9bd7fa6e36feafb8fc9354a73a99830c Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 09:53:51 +0800
Subject: [PATCH 12/27] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/item/service/impl/ItemServiceImpl.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 8767c3543..03ff2f7bd 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
@@ -3152,14 +3152,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             Result<SysDeptDTO> dtoResult = adminFeignClient.getSysDeptInfo(entity.getGridId());
             if (dtoResult.success()) {
                 code = dtoResult.getData().getDisCenterZoningCode();
+                // 因为是街道账号，所以上级一定是市北区委
+                Long pids = dtoResult.getData().getPid();
+                String pnames = dtoResult.getData().getParentName();
+                entity.setParentDeptIds(pids + "");
+                entity.setParentDeptNames(pnames);
+                entity.setAllDeptIds(pids + "," + entity.getGridId());
+                entity.setAllDeptNames(pnames + "-" + entity.getGrid());
             }
-            // 因为是街道账号，所以上级一定是市北区委
-            Long pids = dtoResult.getData().getPid();
-            String pnames = dtoResult.getData().getParentName();
-            entity.setParentDeptIds(pids + "");
-            entity.setParentDeptNames(pnames);
-            entity.setAllDeptIds(pids + "," + entity.getGridId());
-            entity.setAllDeptNames(pnames + "-" + entity.getGrid());
 
             entity.setSerialNum(getSerialNum("FZ" + code));
         }

From bd16fb06921f6def92058c16c33b2ac85d182c6d Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 11 Oct 2022 10:07:59 +0800
Subject: [PATCH 13/27] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenDeptEventEfficiencyDTO.java  | 126 ++++++++++++++
 .../dto/screen/ScreenDeptEventStatDTO.java    | 161 ++++++++++++++++++
 .../dao/ScreenDeptEventEfficiencyDao.java     |  33 ++++
 .../screen/dao/ScreenDeptEventStatDao.java    |  33 ++++
 .../ScreenDeptEventEfficiencyEntity.java      |  96 +++++++++++
 .../entity/ScreenDeptEventStatEntity.java     | 131 ++++++++++++++
 .../ScreenDeptEventEfficiencyService.java     |  95 +++++++++++
 .../service/ScreenDeptEventStatService.java   |  95 +++++++++++
 .../ScreenDeptEventEfficiencyServiceImpl.java | 101 +++++++++++
 .../impl/ScreenDeptEventStatServiceImpl.java  | 101 +++++++++++
 .../screen/ScreenDeptEventEfficiencyDao.xml   |   8 +
 .../mapper/screen/ScreenDeptEventStatDao.xml  |   8 +
 12 files changed, 988 insertions(+)
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventStatDao.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventEfficiencyEntity.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventStatEntity.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventEfficiencyService.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventStatService.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java
new file mode 100644
index 000000000..31a69a315
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.screen;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 大屏-事件结案数与效能评价统计
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-10-11
+ */
+@Data
+public class ScreenDeptEventEfficiencyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 部门ID
+     */
+	private String deptId;
+
+    /**
+     * 部门名
+     */
+	private String deptName;
+
+    /**
+     * 上级ID
+     */
+	private String pid;
+
+    /**
+     * 所有上级ID
+     */
+	private String pids;
+
+    /**
+     * 部门级别
+     */
+	private String deptLevel;
+
+    /**
+     * 统计类型 年year，月month，日date
+     */
+	private String statType;
+
+    /**
+     * 统计日期根据STAT_TYPE分别 yyyy/yyyy-MM/yyyy-MM-dd
+     */
+	private String statDate;
+
+    /**
+     * 事件数
+     */
+	private Integer eventCount;
+
+    /**
+     * 响应数
+     */
+	private Integer responseCount;
+
+    /**
+     * 满意数
+     */
+	private Integer satisfiedCount;
+
+    /**
+     * 结案数
+     */
+	private Integer closedCount;
+
+    /**
+     * 删除标识 0：未删除，1：删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java
new file mode 100644
index 000000000..197dacf3b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java
@@ -0,0 +1,161 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.screen;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 大屏-事件汇总统计
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-10-11
+ */
+@Data
+public class ScreenDeptEventStatDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 部门ID
+     */
+	private String deptId;
+
+    /**
+     * 部门名
+     */
+	private String deptName;
+
+    /**
+     * 上级ID
+     */
+	private String pid;
+
+    /**
+     * 所有上级ID
+     */
+	private String pids;
+
+    /**
+     * 部门级别
+     */
+	private String deptLevel;
+
+    /**
+     * 统计年份yyyy
+     */
+	private String statYear;
+
+    /**
+     * 统计月份yyyy-MM
+     */
+	private String statMonth;
+
+    /**
+     * 统计日期yyyy-MM-dd
+     */
+	private String statDate;
+
+    /**
+     * 事件总数
+     */
+	private Integer eventCount;
+
+    /**
+     * 事件增量
+     */
+	private Integer eventIncr;
+
+    /**
+     * 民生诉求总数
+     */
+	private Integer livelihoodCount;
+
+    /**
+     * 民生诉求增量
+     */
+	private Integer livelihoodIncr;
+
+    /**
+     * 发展诉求总数
+     */
+	private Integer developCount;
+
+    /**
+     * 发展诉求增量
+     */
+	private Integer developIncr;
+
+    /**
+     * 执法诉求总数
+     */
+	private Integer lawCount;
+
+    /**
+     * 执法诉求增量
+     */
+	private Integer lawIncr;
+
+    /**
+     * 结案总数
+     */
+	private Integer closedCount;
+
+    /**
+     * 结案增量
+     */
+	private Integer closedIncr;
+
+    /**
+     * 删除标识 0：未删除，1：删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java
new file mode 100644
index 000000000..6fbca2850
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 大屏-事件结案数与效能评价统计
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-10-11
+ */
+@Mapper
+public interface ScreenDeptEventEfficiencyDao extends BaseDao<ScreenDeptEventEfficiencyEntity> {
+	
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventStatDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventStatDao.java
new file mode 100644
index 000000000..a6f35ad8b
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventStatDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventStatEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 大屏-事件汇总统计
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-10-11
+ */
+@Mapper
+public interface ScreenDeptEventStatDao extends BaseDao<ScreenDeptEventStatEntity> {
+	
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventEfficiencyEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventEfficiencyEntity.java
new file mode 100644
index 000000000..038d7a2df
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventEfficiencyEntity.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 大屏-事件结案数与效能评价统计
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_dept_event_efficiency")
+public class ScreenDeptEventEfficiencyEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID
+     */
+	private String deptId;
+
+    /**
+     * 部门名
+     */
+	private String deptName;
+
+    /**
+     * 上级ID
+     */
+	private String pid;
+
+    /**
+     * 所有上级ID
+     */
+	private String pids;
+
+    /**
+     * 部门级别
+     */
+	private String deptLevel;
+
+    /**
+     * 统计类型 年year，月month，日date
+     */
+	private String statType;
+
+    /**
+     * 统计日期根据STAT_TYPE分别 yyyy/yyyy-MM/yyyy-MM-dd
+     */
+	private String statDate;
+
+    /**
+     * 事件数
+     */
+	private Integer eventCount;
+
+    /**
+     * 响应数
+     */
+	private Integer responseCount;
+
+    /**
+     * 满意数
+     */
+	private Integer satisfiedCount;
+
+    /**
+     * 结案数
+     */
+	private Integer closedCount;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventStatEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventStatEntity.java
new file mode 100644
index 000000000..41f4d8806
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventStatEntity.java
@@ -0,0 +1,131 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 大屏-事件汇总统计
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("screen_dept_event_stat")
+public class ScreenDeptEventStatEntity extends BaseEpdcEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID
+     */
+	private String deptId;
+
+    /**
+     * 部门名
+     */
+	private String deptName;
+
+    /**
+     * 上级ID
+     */
+	private String pid;
+
+    /**
+     * 所有上级ID
+     */
+	private String pids;
+
+    /**
+     * 部门级别
+     */
+	private String deptLevel;
+
+    /**
+     * 统计年份yyyy
+     */
+	private String statYear;
+
+    /**
+     * 统计月份yyyy-MM
+     */
+	private String statMonth;
+
+    /**
+     * 统计日期yyyy-MM-dd
+     */
+	private String statDate;
+
+    /**
+     * 事件总数
+     */
+	private Integer eventCount;
+
+    /**
+     * 事件增量
+     */
+	private Integer eventIncr;
+
+    /**
+     * 民生诉求总数
+     */
+	private Integer livelihoodCount;
+
+    /**
+     * 民生诉求增量
+     */
+	private Integer livelihoodIncr;
+
+    /**
+     * 发展诉求总数
+     */
+	private Integer developCount;
+
+    /**
+     * 发展诉求增量
+     */
+	private Integer developIncr;
+
+    /**
+     * 执法诉求总数
+     */
+	private Integer lawCount;
+
+    /**
+     * 执法诉求增量
+     */
+	private Integer lawIncr;
+
+    /**
+     * 结案总数
+     */
+	private Integer closedCount;
+
+    /**
+     * 结案增量
+     */
+	private Integer closedIncr;
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventEfficiencyService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventEfficiencyService.java
new file mode 100644
index 000000000..eb5a9e68f
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventEfficiencyService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.screen.ScreenDeptEventEfficiencyDTO;
+import com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 大屏-事件结案数与效能评价统计
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-10-11
+ */
+public interface ScreenDeptEventEfficiencyService extends BaseService<ScreenDeptEventEfficiencyEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ScreenDeptEventEfficiencyDTO>
+     * @author generator
+     * @date 2022-10-11
+     */
+    PageData<ScreenDeptEventEfficiencyDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ScreenDeptEventEfficiencyDTO>
+     * @author generator
+     * @date 2022-10-11
+     */
+    List<ScreenDeptEventEfficiencyDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ScreenDeptEventEfficiencyDTO
+     * @author generator
+     * @date 2022-10-11
+     */
+    ScreenDeptEventEfficiencyDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-10-11
+     */
+    void save(ScreenDeptEventEfficiencyDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-10-11
+     */
+    void update(ScreenDeptEventEfficiencyDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-10-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventStatService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventStatService.java
new file mode 100644
index 000000000..ef3dad2aa
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventStatService.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.screen.ScreenDeptEventStatDTO;
+import com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventStatEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 大屏-事件汇总统计
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-10-11
+ */
+public interface ScreenDeptEventStatService extends BaseService<ScreenDeptEventStatEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ScreenDeptEventStatDTO>
+     * @author generator
+     * @date 2022-10-11
+     */
+    PageData<ScreenDeptEventStatDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ScreenDeptEventStatDTO>
+     * @author generator
+     * @date 2022-10-11
+     */
+    List<ScreenDeptEventStatDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ScreenDeptEventStatDTO
+     * @author generator
+     * @date 2022-10-11
+     */
+    ScreenDeptEventStatDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-10-11
+     */
+    void save(ScreenDeptEventStatDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2022-10-11
+     */
+    void update(ScreenDeptEventStatDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2022-10-11
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
new file mode 100644
index 000000000..204793f0f
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventEfficiencyServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.dto.screen.ScreenDeptEventEfficiencyDTO;
+import com.elink.esua.epdc.modules.screen.dao.ScreenDeptEventEfficiencyDao;
+import com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity;
+import com.elink.esua.epdc.modules.screen.service.ScreenDeptEventEfficiencyService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 大屏-事件结案数与效能评价统计
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-10-11
+ */
+@Service
+public class ScreenDeptEventEfficiencyServiceImpl extends BaseServiceImpl<ScreenDeptEventEfficiencyDao, ScreenDeptEventEfficiencyEntity> implements ScreenDeptEventEfficiencyService {
+
+
+    @Override
+    public PageData<ScreenDeptEventEfficiencyDTO> page(Map<String, Object> params) {
+        IPage<ScreenDeptEventEfficiencyEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ScreenDeptEventEfficiencyDTO.class);
+    }
+
+    @Override
+    public List<ScreenDeptEventEfficiencyDTO> list(Map<String, Object> params) {
+        List<ScreenDeptEventEfficiencyEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ScreenDeptEventEfficiencyDTO.class);
+    }
+
+    private QueryWrapper<ScreenDeptEventEfficiencyEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ScreenDeptEventEfficiencyEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ScreenDeptEventEfficiencyDTO get(String id) {
+        ScreenDeptEventEfficiencyEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ScreenDeptEventEfficiencyDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ScreenDeptEventEfficiencyDTO dto) {
+        ScreenDeptEventEfficiencyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenDeptEventEfficiencyEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ScreenDeptEventEfficiencyDTO dto) {
+        ScreenDeptEventEfficiencyEntity entity = ConvertUtils.sourceToTarget(dto, ScreenDeptEventEfficiencyEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java
new file mode 100644
index 000000000..b945ce926
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.screen.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.dto.screen.ScreenDeptEventStatDTO;
+import com.elink.esua.epdc.modules.screen.dao.ScreenDeptEventStatDao;
+import com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventStatEntity;
+import com.elink.esua.epdc.modules.screen.service.ScreenDeptEventStatService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 大屏-事件汇总统计
+ *
+ * @author elink elink@elink-cn.com
+ * @since v1.0.0 2022-10-11
+ */
+@Service
+public class ScreenDeptEventStatServiceImpl extends BaseServiceImpl<ScreenDeptEventStatDao, ScreenDeptEventStatEntity> implements ScreenDeptEventStatService {
+
+
+    @Override
+    public PageData<ScreenDeptEventStatDTO> page(Map<String, Object> params) {
+        IPage<ScreenDeptEventStatEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ScreenDeptEventStatDTO.class);
+    }
+
+    @Override
+    public List<ScreenDeptEventStatDTO> list(Map<String, Object> params) {
+        List<ScreenDeptEventStatEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ScreenDeptEventStatDTO.class);
+    }
+
+    private QueryWrapper<ScreenDeptEventStatEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ScreenDeptEventStatEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ScreenDeptEventStatDTO get(String id) {
+        ScreenDeptEventStatEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ScreenDeptEventStatDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ScreenDeptEventStatDTO dto) {
+        ScreenDeptEventStatEntity entity = ConvertUtils.sourceToTarget(dto, ScreenDeptEventStatEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ScreenDeptEventStatDTO dto) {
+        ScreenDeptEventStatEntity entity = ConvertUtils.sourceToTarget(dto, ScreenDeptEventStatEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml
new file mode 100644
index 000000000..d3b46cb11
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.screen.dao.ScreenDeptEventEfficiencyDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml
new file mode 100644
index 000000000..5b53436cf
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.elink.esua.epdc.modules.screen.dao.ScreenDeptEventStatDao">
+
+
+
+</mapper>
\ No newline at end of file

From 3c25573765926315e2f3b4e2f2abbc1a340903d8 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 10:50:32 +0800
Subject: [PATCH 14/27] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/modules/item/entity/ItemEntity.java   | 4 ++++
 .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
index 9656ebd2a..0555631cc 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java
@@ -153,6 +153,10 @@ public class ItemEntity extends BaseEpdcEntity {
      */
     private Double issueLongitude;
 
+    /**
+     * 满意度评价状态(0-不可评价，1-可评价)
+     */
+    private String evaluationState;
     /**
      * 满意度评价得分
      */
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 03ff2f7bd..b567b334b 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
@@ -3754,6 +3754,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             itemHandleProcessDto.setGridPartyname("结案");
             itemHandleProcessDto.setGridTaskcnname("区中心");
             item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue());
+            // 可以进行评价了
+            item.setEvaluationState(NumConstant.ONE_STR);
             updateById(item);
         } else if ("1".equals(formDto.getState())) {
             itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue());

From 73eb8c97c2bee6a0578233e3e985dd14d104f301 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 11 Oct 2022 11:17:57 +0800
Subject: [PATCH 15/27] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../events/form/ItemDailyStatisFormDTO.java   | 42 ++++++++++++++++
 .../result/ItemDailyStatisResultDTO.java      | 35 ++++++++++++++
 .../esua/epdc/modules/item/dao/ItemDao.java   |  4 ++
 .../controller/ScreenItemController.java      | 16 +++++--
 .../modules/screen/service/ScreenService.java |  7 ++-
 .../service/impl/ScreenServiceImpl.java       | 34 ++++++++++++-
 .../main/resources/mapper/item/ItemDao.xml    | 48 +++++++++++++++++++
 7 files changed, 178 insertions(+), 8 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/ItemDailyStatisFormDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/ItemDailyStatisFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/ItemDailyStatisFormDTO.java
new file mode 100644
index 000000000..6e9e4e960
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/ItemDailyStatisFormDTO.java
@@ -0,0 +1,42 @@
+package com.elink.esua.epdc.dto.events.form;
+
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@Data
+public class ItemDailyStatisFormDTO implements Serializable {
+    private static final long serialVersionUID = 3950470078846120789L;
+
+    /**
+     * 网格、部门Id
+     */
+    @NotBlank(message = "部门Id不能为空", groups = AddGroup.class)
+    private String deptId;
+    /**
+     * 诉求分类：0民生 1发展 2执法
+     */
+    private String peopleFlag;
+    /**
+     * 开始日期 yyyy-MM-dd
+     */
+    private String startTime;
+    /**
+     * 结束日期 yyyy-MM-dd
+     */
+    private String endTime;
+    /**
+     * 日维度 yyyy-MM-dd
+     */
+    private String statDate;
+    /**
+     * 月维度 yyyy-MM
+     */
+    private String statMonth;
+    /**
+     * 年维度 yyyy
+     */
+    private String statYear;
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java
new file mode 100644
index 000000000..3fafe30b3
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java
@@ -0,0 +1,35 @@
+package com.elink.esua.epdc.dto.events.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ItemDailyStatisResultDTO implements Serializable {
+    private static final long serialVersionUID = 1171586248033198322L;
+    /**
+     * 网格、部门Id
+     */
+    private String deptId;
+    /**
+     * 诉求分类：0民生 1发展 2执法
+     */
+    private String peopleFlag;
+    /**
+     * 总数
+     */
+    private Integer total;
+    /**
+     * 待处理总数
+     */
+    private Integer pendingTotal;
+    /**
+     * 处理中总数
+     */
+    private Integer processingTotal;
+    /**
+     * 已结案总数
+     */
+    private Integer closedTotal;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
index b9b3fca04..db2fbc4c9 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
@@ -18,6 +18,8 @@
 package com.elink.esua.epdc.modules.item.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO;
+import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO;
 import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO;
@@ -464,4 +466,6 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @date 2022/9/19 10:51
      */
     List<ItemHandleProcessDTO> listItemHandleDept();
+
+    ItemDailyStatisResultDTO itemDailyStatis(ItemDailyStatisFormDTO formDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
index 69778b827..f5b0ca211 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
@@ -18,9 +18,15 @@
 package com.elink.esua.epdc.modules.screen.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO;
+import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO;
 import com.elink.esua.epdc.modules.screen.service.ScreenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -38,14 +44,14 @@ public class ScreenItemController {
 
 
     /**
-     * 项目部门日统计表
+     * 数据统计-各诉求不同状态数据
      *
      * @return
      */
-    @PostMapping
-    public Result save() {
-
-        return new Result();
+    @PostMapping("itemdailystatis")
+    public Result<ItemDailyStatisResultDTO> itemDailyStatis(@RequestBody ItemDailyStatisFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
+        return new Result<ItemDailyStatisResultDTO>().ok(screenService.itemDailyStatis(formDTO));
     }
 
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
index 92b23793a..a9abfa5b2 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
@@ -17,11 +17,14 @@
 
 package com.elink.esua.epdc.modules.screen.service;
 
+import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO;
+import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO;
+
 /**
- * 项目部门日统计表
+ * 项目统计相关接口
  */
 public interface ScreenService {
 
-
+    ItemDailyStatisResultDTO itemDailyStatis(ItemDailyStatisFormDTO formDTO);
 
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
index 43ce157f5..1ab4cd9fb 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
@@ -17,15 +17,47 @@
 
 package com.elink.esua.epdc.modules.screen.service.impl;
 
+import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO;
+import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO;
+import com.elink.esua.epdc.modules.item.dao.ItemDao;
 import com.elink.esua.epdc.modules.screen.service.ScreenService;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 /**
- * 项目部门日统计表
+ * 项目统计相关接口
  */
 @Service
 public class ScreenServiceImpl implements ScreenService {
+    @Autowired
+    private ItemDao itemDao;
+
 
+    /**
+     * 数据统计-统计各诉求不同状态数据
+     * 默认查询当前组织截止到昨天三大诉求的各状态数据
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public ItemDailyStatisResultDTO itemDailyStatis(ItemDailyStatisFormDTO formDTO) {
+        ItemDailyStatisResultDTO resultDTO = new ItemDailyStatisResultDTO();
+        //1.入参时间有值的按时间查，没值的默认查截止到昨天的数据
+        if(StringUtils.isEmpty(formDTO.getStatDate())&&StringUtils.isEmpty(formDTO.getStatMonth())&&StringUtils.isEmpty(formDTO.getStatYear())){
+            DateTime dateTime = new DateTime(new Date());
+            Date d = dateTime.plusDays(-1).toDate();
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            formDTO.setStatDate(df.format(d));
+        }
+        //2.按条件统计数据
+        resultDTO = itemDao.itemDailyStatis(formDTO);
+        return resultDTO;
+    }
 
 
 }
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 0819f7d5c..e67a143a4 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
@@ -2021,4 +2021,52 @@
             b.ITEM_ID
     </select>
 
+    <select id="itemDailyStatis" resultType="com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO">
+        SELECT
+            COUNT(a.id)total,
+            SUM(a.ITEM_STATE='10')closedTotal,
+            sum((case when a.ITEM_STATE='0' and b.STATE = 1001 then 1 else 0 end))pendingTotal,
+            sum((case when a.ITEM_STATE='0' and b.STATE != 1001 then 1 else 0 end))processingTotal
+        FROM
+            epdc_item a
+        LEFT JOIN (
+            select h.id,h.item_id,h.created_time,h.state
+            from epdc_item_handle_process h
+            where h.del_flag = '0'
+            and h.created_time = (
+                select max(created_time)
+                from epdc_item_handle_process
+                where h.item_id = item_id
+                and del_flag = '0'
+            )
+            GROUP BY h.item_id
+        )b ON a.id = b.item_id
+        WHERE
+            a.del_flag = '0'
+        AND a.is_people = '1'
+        AND a.event_id is NULL
+        AND a.issue_id is NULL
+        <if test="deptId != null and deptId != ''">
+            AND all_dept_ids LIKE concat('%', trim(#{deptId}), '%')
+        </if>
+        <if test="peopleFlag != null and peopleFlag != ''">
+            AND a.people_flag = #{peopleFlag}
+        </if>
+        <if test="statDate != null and statDate != ''">
+            AND DATE_FORMAT(a.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{statDate}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(a.created_time,'%Y-%m-%d') >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(a.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="statMonth != null and statMonth != ''">
+            AND DATE_FORMAT(a.created_time,'%Y-%m') = #{statMonth}
+        </if>
+        <if test="statYear != null and statYear != ''">
+            AND DATE_FORMAT(a.created_time,'%Y') = #{statYear}
+        </if>
+    </select>
+
 </mapper>

From 84d81654fbe5e1dc320ce9fbe57864e9147da4cb Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 11 Oct 2022 13:41:14 +0800
Subject: [PATCH 16/27] =?UTF-8?q?=E8=A1=A5=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/events/result/ItemDailyStatisResultDTO.java  | 8 ++++----
 .../modules/screen/service/impl/ScreenServiceImpl.java    | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java
index 3fafe30b3..85f17e8c1 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java
@@ -18,18 +18,18 @@ public class ItemDailyStatisResultDTO implements Serializable {
     /**
      * 总数
      */
-    private Integer total;
+    private Integer total = 0;
     /**
      * 待处理总数
      */
-    private Integer pendingTotal;
+    private Integer pendingTotal = 0;
     /**
      * 处理中总数
      */
-    private Integer processingTotal;
+    private Integer processingTotal = 0;
     /**
      * 已结案总数
      */
-    private Integer closedTotal;
+    private Integer closedTotal = 0;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
index 1ab4cd9fb..8372f8c11 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
@@ -47,11 +47,13 @@ public class ScreenServiceImpl implements ScreenService {
     @Override
     public ItemDailyStatisResultDTO itemDailyStatis(ItemDailyStatisFormDTO formDTO) {
         ItemDailyStatisResultDTO resultDTO = new ItemDailyStatisResultDTO();
+        resultDTO.setDeptId(formDTO.getDeptId());
+        resultDTO.setPeopleFlag(formDTO.getPeopleFlag());
         //1.入参时间有值的按时间查，没值的默认查截止到昨天的数据
         if(StringUtils.isEmpty(formDTO.getStatDate())&&StringUtils.isEmpty(formDTO.getStatMonth())&&StringUtils.isEmpty(formDTO.getStatYear())){
             DateTime dateTime = new DateTime(new Date());
             Date d = dateTime.plusDays(-1).toDate();
-            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             formDTO.setStatDate(df.format(d));
         }
         //2.按条件统计数据

From 477459bcff56fea4f3cea44712830c0a6d646187 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 14:49:01 +0800
Subject: [PATCH 17/27] =?UTF-8?q?=E7=BB=93=E6=A1=88=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E5=9C=A8=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E5=B8=82=E5=B9=B3=E5=8F=B0=EF=BC=8C=E5=8F=AA=E6=9C=89=E5=90=B9?=
 =?UTF-8?q?=E5=93=A8=E7=9A=84=E6=97=B6=E5=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/controller/SysDeptController.java    | 10 ++++++-
 .../esua/epdc/service/SysDeptService.java     | 10 +++++++
 .../epdc/service/impl/SysDeptServiceImpl.java |  9 +++++++
 .../src/main/resources/mapper/SysDeptDao.xml  |  6 +++++
 .../controller/PushToCityGridController.java  |  8 +++---
 .../item/service/PushToCityGridService.java   |  6 ++---
 .../item/service/impl/ItemServiceImpl.java    | 26 +++++++++----------
 .../impl/PushToCityGridServiceImpl.java       |  6 ++---
 8 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
index 4df5fcddb..18d7e3dbd 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
@@ -346,7 +346,7 @@ public class SysDeptController {
     }
 
     /**
-     * @param [deptId]
+     * @param deptId
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 获得部门类型
      * @author wangtong
@@ -513,4 +513,12 @@ public class SysDeptController {
         return new Result<SysDeptDTO>().ok(sysDeptService.getDept(formDTO));
     }
 
+    @GetMapping("option/list")
+    @ApiOperation("下拉列表")
+    public Result<List<SysDeptDTO>> listOption(@RequestParam Map<String, Object> params) {
+        List<SysDeptDTO> list = sysDeptService.listDefault(params);
+
+        return new Result<List<SysDeptDTO>>().ok(list);
+    }
+
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index ab465f76a..7334164ec 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -34,6 +34,16 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
 
     List<SysDeptDTO> list(Map<String, Object> params);
 
+    /**
+     * 默认列表，无数据权限
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
+     * @author zhy
+     * @date 2022/10/11 14:46
+     */
+    List<SysDeptDTO> listDefault(Map<String, Object> params);
+
     SysDeptDTO get(Long id);
 
     void save(SysDeptDTO dto);
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index e14f6b962..1e532ea33 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -129,6 +129,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return TreeUtils.build(dtoList);
     }
 
+    @Override
+    public List<SysDeptDTO> listDefault(Map<String, Object> params) {
+        List<SysDeptEntity> entityList = baseDao.getList(params);
+
+        List<SysDeptDTO> dtoList = ConvertUtils.sourceToTarget(entityList, SysDeptDTO.class);
+
+        return TreeUtils.build(dtoList);
+    }
+
     @Override
     public List<SysSimpleDeptDTO> subList(String pid) {
         QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
index 7f70be9d2..a5332f21f 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml
@@ -12,6 +12,12 @@
                 #{id}
             </foreach>
         </if>
+        <if test="pid != null and pid != ''">
+            AND t1.pid = #{pid}
+        </if>
+        <if test="eventContent != null and eventContent != ''">
+            AND t1.type_key = #{typeKey}
+        </if>
         order by t1.sort asc
     </select>
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java
index 3c4c29881..9f8308944 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java
@@ -6,8 +6,6 @@ import com.elink.esua.epdc.modules.item.service.PushToCityGridService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.management.relation.RelationSupport;
-
 @RestController
 @RequestMapping("PushToCity")
 public class PushToCityGridController {
@@ -52,7 +50,7 @@ public class PushToCityGridController {
      */
     @PostMapping("AppealReporting")
     public Result AppealReporting(String processId, String source){
-        return pushToCityGridService.AppealReporting(processId, source);
+        return pushToCityGridService.appealReporting(processId, source);
     }
 
     /**
@@ -65,7 +63,7 @@ public class PushToCityGridController {
      */
     @PostMapping("ReportRejection")
     public Result ReportRejection(ItemHandleProcessDTO dto){
-        return pushToCityGridService.ReportRejection(dto.getItemId());
+        return pushToCityGridService.reportRejection(dto.getItemId());
     }
 
     /**
@@ -78,6 +76,6 @@ public class PushToCityGridController {
      */
     @PostMapping("AppealHandling")
     public Result AppealHandling(@RequestBody ItemHandleProcessDTO dto){
-        return pushToCityGridService.AppealHandling(dto);
+        return pushToCityGridService.appealHandling(dto);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java
index 92bf8c61a..60646335c 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java
@@ -107,7 +107,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 10:22
      */
-    Result AppealReporting(String processId,String source);
+    Result appealReporting(String processId, String source);
 
     /**
      * 事件感知
@@ -127,7 +127,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 10:43
      */
-    Result ReportRejection(String id);
+    Result reportRejection(String id);
 
     /**
      * 诉求处理
@@ -137,7 +137,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 11:01
      */
-    Result AppealHandling(ItemHandleProcessDTO dto);
+    Result appealHandling(ItemHandleProcessDTO dto);
 
     /**
      * 2.8 诉求退件
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 b567b334b..432fb15de 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
@@ -1389,7 +1389,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 // 发送菜单消息-待处理项目-吹哨部门
                 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null);
                 // 网格吹哨,上报市平台
-                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
+                pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
                 log.info("网格吹哨，上报市平台-结束");
                 // 上报网格化平台（社区吹哨）
             } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) {
@@ -1401,7 +1401,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 log.info("处理项目-上报网格化平台-if结束");
 
                 //社区吹哨，上报市平台
-                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
+                pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
                 log.info("社区吹哨-上报市平台-结束");
                 // 结案申请
             } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) {
@@ -1462,11 +1462,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 longTreeSet.addAll(newDeptIds);
                 List<Long> deptIds = new ArrayList<>(longTreeSet);
 
-                // 网格结案，社区结案，上报市平台
-                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
+                // 网格结案申请，社区结案申请，上报市平台
+//                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
                 // 发送菜单消息-待处理项目-吹哨部门
                 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null);
-                pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
+                pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
                 log.info("处理项目-结案申请-if结束");
             } else {
                 handleProcessEntity.setState(dto.getHandleCategory());
@@ -2837,7 +2837,7 @@ 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);
         }
     }
 
@@ -3580,12 +3580,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             throw new RenException("审批标识有误");
         }
         itemHandleProcessDao.insert(process);
-        //同意的时候，上报诉求处理
-        if (NumConstant.ZERO_STR.equals(formDto.getCheckFlag())) {
-            // 社区审批，上报市平台
-            pushToCityGridService.AppealReporting(process.getId(), NumConstant.ZERO_STR);
-            //pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class));
-        }
+//        // 结案申请，同意的时候，上报诉求处理
+//        if (NumConstant.ZERO_STR.equals(formDto.getCheckFlag())) {
+//            // 社区审批，上报市平台
+////            pushToCityGridService.AppealReporting(process.getId(), NumConstant.ZERO_STR);
+//            //pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class));
+//        }
 
         if ("0".equals(formDto.getCheckFlag())) {
             //发送结案申请至街道网格化平台
@@ -3778,7 +3778,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if ("1".equals(formDto.getState())) {
                 // 上报驳回，上报市平台
                 log.info("上报驳回，上报市平台" + itemHandleProcessDto.getId());
-                pushToCityGridService.ReportRejection(itemHandleProcessDto.getId());
+                pushToCityGridService.reportRejection(itemHandleProcessDto.getId());
             } else if ("0".equals(formDto.getState())) {
                 // 诉求审核，上报市平台
                 pushToCityGridService.appealAudit(itemHandleProcessDto.getId());
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
index f72c7389f..c68647e28 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
@@ -439,7 +439,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 10:22
      */
     @Override
-    public Result AppealReporting(String processId, String source) {
+    public Result appealReporting(String processId, String source) {
         ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getAppealReporting(processId);
         if (null == item) {
             log.error("流程节点不存在");
@@ -528,7 +528,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 10:44
      */
     @Override
-    public Result ReportRejection(String id) {
+    public Result reportRejection(String id) {
         String ids = id;   // ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue();
         ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getReportRejection(ids);
         if (null == item) {
@@ -587,7 +587,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 11:02
      */
     @Override
-    public Result AppealHandling(ItemHandleProcessDTO processDTO) {
+    public Result appealHandling(ItemHandleProcessDTO processDTO) {
         String id = processDTO.getId();
         AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id, processDTO.getItemId());
 

From 225525d5726690f66dd22bb49305a7612a3968c9 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 14:56:53 +0800
Subject: [PATCH 18/27] =?UTF-8?q?=E7=AE=80=E5=8D=95=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/elink/esua/epdc/dto/DeptDTO.java | 92 +++++++++++++++++++
 .../epdc/controller/SysDeptController.java    |  6 +-
 .../esua/epdc/service/SysDeptService.java     |  4 +-
 .../epdc/service/impl/SysDeptServiceImpl.java |  6 +-
 4 files changed, 99 insertions(+), 9 deletions(-)
 create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptDTO.java

diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptDTO.java
new file mode 100644
index 000000000..c5e1bfa15
--- /dev/null
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptDTO.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 部门管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Data
+public class DeptDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 上级ID
+     */
+    private Long pid;
+    /**
+     * 所有上级ID，用逗号分开
+     */
+    private String pids;
+    /**
+     * 部门名称
+     */
+    private String name;
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 上级部门名称
+     */
+    private String parentName;
+
+    /**
+     * 部门类型键值
+     */
+    private String typeKey;
+
+    /**
+     * 部门编码
+     */
+    private String partyCode;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 联系方式
+     */
+    private String mobile;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 所属地区码（所属组织地区码）
+     */
+    private String areaCode;
+
+    /**第三方编码
+     */
+    private String infoCode;
+
+    /**
+     * 市中心区划编码
+     */
+    private String disCenterZoningCode;
+}
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
index 18d7e3dbd..4c12f0abb 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
@@ -515,10 +515,10 @@ public class SysDeptController {
 
     @GetMapping("option/list")
     @ApiOperation("下拉列表")
-    public Result<List<SysDeptDTO>> listOption(@RequestParam Map<String, Object> params) {
-        List<SysDeptDTO> list = sysDeptService.listDefault(params);
+    public Result<List<DeptDTO>> listOption(@RequestParam Map<String, Object> params) {
+        List<DeptDTO> list = sysDeptService.listDefault(params);
 
-        return new Result<List<SysDeptDTO>>().ok(list);
+        return new Result<List<DeptDTO>>().ok(list);
     }
 
 }
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
index 7334164ec..bd8b42260 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
@@ -38,11 +38,11 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * 默认列表，无数据权限
      *
      * @param params
-     * @return java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
+     * @return java.util.List<com.elink.esua.epdc.dto.DeptDTO>
      * @author zhy
      * @date 2022/10/11 14:46
      */
-    List<SysDeptDTO> listDefault(Map<String, Object> params);
+    List<DeptDTO> listDefault(Map<String, Object> params);
 
     SysDeptDTO get(Long id);
 
diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
index 1e532ea33..f18e3ee6f 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
@@ -130,12 +130,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     }
 
     @Override
-    public List<SysDeptDTO> listDefault(Map<String, Object> params) {
+    public List<DeptDTO> listDefault(Map<String, Object> params) {
         List<SysDeptEntity> entityList = baseDao.getList(params);
 
-        List<SysDeptDTO> dtoList = ConvertUtils.sourceToTarget(entityList, SysDeptDTO.class);
-
-        return TreeUtils.build(dtoList);
+        return ConvertUtils.sourceToTarget(entityList, DeptDTO.class);
     }
 
     @Override

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 19/27] =?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,

From 8185fa1ef971056c11f41250efd465e5029ca2ca Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 11 Oct 2022 17:00:15 +0800
Subject: [PATCH 20/27] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/ItemDailyStatisResultDTO.java      | 12 +++++
 .../esua/epdc/modules/item/dao/ItemDao.java   | 10 ++--
 .../controller/ScreenItemController.java      | 10 +++-
 .../modules/screen/service/ScreenService.java |  1 +
 .../service/impl/ScreenServiceImpl.java       | 34 ++++++++++++++
 .../main/resources/mapper/item/ItemDao.xml    | 47 ++++++++++++++++++-
 6 files changed, 107 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java
index 85f17e8c1..04654085f 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/ItemDailyStatisResultDTO.java
@@ -31,5 +31,17 @@ public class ItemDailyStatisResultDTO implements Serializable {
      * 已结案总数
      */
     private Integer closedTotal = 0;
+    /**
+     * 红灯事件数
+     */
+    private Integer redTotal = 0;
+    /**
+     * 黄灯事件数
+     */
+    private Integer yellowTotal = 0;
+    /**
+     * 绿灯事件数
+     */
+    private Integer greenTotal = 0;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
index db2fbc4c9..86f899497 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
@@ -18,18 +18,18 @@
 package com.elink.esua.epdc.modules.item.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
 import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO;
 import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO;
-import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
-import com.elink.esua.epdc.dto.item.form.*;
-import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO;
 import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
-import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
+import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
 import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
+import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO;
 import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO;
+import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO;
 import com.elink.esua.epdc.modules.item.entity.ItemEntity;
 import com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -468,4 +468,6 @@ public interface ItemDao extends BaseDao<ItemEntity> {
     List<ItemHandleProcessDTO> listItemHandleDept();
 
     ItemDailyStatisResultDTO itemDailyStatis(ItemDailyStatisFormDTO formDTO);
+
+    List<ItemDTO> getStatisItemList(ItemDailyStatisFormDTO formDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
index f5b0ca211..59fd60c6a 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
@@ -20,7 +20,6 @@ package com.elink.esua.epdc.modules.screen.controller;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO;
 import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO;
 import com.elink.esua.epdc.modules.screen.service.ScreenService;
@@ -54,5 +53,14 @@ public class ScreenItemController {
         return new Result<ItemDailyStatisResultDTO>().ok(screenService.itemDailyStatis(formDTO));
     }
 
+    /**
+     * 数据统计-各诉求红黄绿灯事件数
+     */
+    @PostMapping("itemlampdailystatis")
+    public Result<ItemDailyStatisResultDTO> itemLampDailyStatis(@RequestBody ItemDailyStatisFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
+        return new Result<ItemDailyStatisResultDTO>().ok(screenService.itemLampDailyStatis(formDTO));
+    }
+
 
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
index a9abfa5b2..7427d79cb 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
@@ -27,4 +27,5 @@ public interface ScreenService {
 
     ItemDailyStatisResultDTO itemDailyStatis(ItemDailyStatisFormDTO formDTO);
 
+    ItemDailyStatisResultDTO itemLampDailyStatis(ItemDailyStatisFormDTO formDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
index 8372f8c11..01dd64a9e 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.screen.service.impl;
 
 import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO;
 import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO;
+import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.modules.item.dao.ItemDao;
 import com.elink.esua.epdc.modules.screen.service.ScreenService;
 import org.apache.commons.lang3.StringUtils;
@@ -28,6 +29,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 项目统计相关接口
@@ -61,5 +63,37 @@ public class ScreenServiceImpl implements ScreenService {
         return resultDTO;
     }
 
+    /**
+     * 数据统计-各诉求红黄绿灯事件数
+     */
+    @Override
+    public ItemDailyStatisResultDTO itemLampDailyStatis(ItemDailyStatisFormDTO formDTO) {
+        ItemDailyStatisResultDTO resultDTO = new ItemDailyStatisResultDTO();
+        resultDTO.setDeptId(formDTO.getDeptId());
+        resultDTO.setPeopleFlag(formDTO.getPeopleFlag());
+        //1.入参时间有值的按时间查，没值的默认查截止到昨天的数据
+        //1.入参时间有值的按时间查，没值的默认查截止到昨天的数据
+        if(StringUtils.isEmpty(formDTO.getStatDate())&&StringUtils.isEmpty(formDTO.getStatMonth())&&StringUtils.isEmpty(formDTO.getStatYear())){
+            DateTime dateTime = new DateTime(new Date());
+            Date d = dateTime.plusDays(-1).toDate();
+            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+            formDTO.setStatDate(df.format(d));
+        }
+        //2.按条件查询业务数据
+        List<ItemDTO> list = itemDao.getStatisItemList(formDTO);
+        //3.统计红黄绿灯类型，封装数据
+        int redTotal = 0;
+        int yellowTotal = 0;
+        int greenTotal = 0;
+        Date date = new Date();
+        for (ItemDTO i : list){
+
+        }
+        resultDTO.setRedTotal(redTotal);
+        resultDTO.setYellowTotal(yellowTotal);
+        resultDTO.setGreenTotal(greenTotal);
+        return resultDTO;
+    }
+
 
 }
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 e67a143a4..0d9e91917 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
@@ -2026,7 +2026,15 @@
             COUNT(a.id)total,
             SUM(a.ITEM_STATE='10')closedTotal,
             sum((case when a.ITEM_STATE='0' and b.STATE = 1001 then 1 else 0 end))pendingTotal,
-            sum((case when a.ITEM_STATE='0' and b.STATE != 1001 then 1 else 0 end))processingTotal
+            sum((case when a.ITEM_STATE='0' and b.STATE != 1001 then 1 else 0 end))processingTotal,
+            sum((case when a.ITEM_STATE='0' and getworkminute(a.created_time,'2022-10-08 12:00:00')>=360 then 1 else 0 end))redTotal,
+            sum(
+                (case when a.ITEM_STATE='0'
+                           and getworkminute(a.created_time,'2022-10-08 12:00:00')>120
+                           and getworkminute(a.created_time,'2022-10-08 12:00:00')<![CDATA[ <= ]]>360
+                then 1 else 0 end)
+                )yellowTotal,
+            sum((case when a.ITEM_STATE='0' and getworkminute(a.created_time,'2022-10-08 12:00:00')<![CDATA[ <= ]]>120 then 1 else 0 end))greenTotal
         FROM
             epdc_item a
         LEFT JOIN (
@@ -2047,7 +2055,7 @@
         AND a.event_id is NULL
         AND a.issue_id is NULL
         <if test="deptId != null and deptId != ''">
-            AND all_dept_ids LIKE concat('%', trim(#{deptId}), '%')
+            AND a.all_dept_ids LIKE concat('%', trim(#{deptId}), '%')
         </if>
         <if test="peopleFlag != null and peopleFlag != ''">
             AND a.people_flag = #{peopleFlag}
@@ -2069,4 +2077,39 @@
         </if>
     </select>
 
+    <select id="getStatisItemList" resultType="com.elink.esua.epdc.dto.item.ItemDTO">
+        SELECT
+        getworkminute(CREATED_TIME,'2022-10-08 12:00:00')a,
+        sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')<=120 then 1 else 0 end))b,
+        sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')>120 and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')<=360 then 1 else 0 end))c,
+        sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')>=360 then 1 else 0 end))d
+        FROM epdc_item ei
+        WHERE
+            ei.del_flag = '0'
+        AND ei.is_people = '1'
+        AND ei.event_id IS NULL
+        AND ei.s IS NULL
+        <if test="deptId != null and deptId != ''">
+            AND ei.all_dept_ids LIKE concat('%', trim(#{deptId}), '%')
+        </if>
+        <if test="peopleFlag != null and peopleFlag != ''">
+            AND ei.people_flag = #{peopleFlag}
+        </if>
+        <if test="statDate != null and statDate != ''">
+            AND DATE_FORMAT(ei.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{statDate}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(ei.created_time,'%Y-%m-%d') >= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(ei.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="statMonth != null and statMonth != ''">
+            AND DATE_FORMAT(ei.created_time,'%Y-%m') = #{statMonth}
+        </if>
+        <if test="statYear != null and statYear != ''">
+            AND DATE_FORMAT(ei.created_time,'%Y') = #{statYear}
+        </if>
+    </select>
+
 </mapper>

From 7570ee2f4652806ce9b3b4f3fb550d19c96e1171 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 17:12:36 +0800
Subject: [PATCH 21/27] =?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  | 24 -------------------
 .../item/service/impl/ItemServiceImpl.java    |  2 +-
 .../main/resources/mapper/item/ItemDao.xml    | 11 ++++-----
 3 files changed, 5 insertions(+), 32 deletions(-)

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 38d2dd119..1196d852b 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
@@ -120,28 +120,4 @@ public class ItemAppealPageResultDTO implements Serializable {
      */
     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 0a80a8816..a387e6e91 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
@@ -2195,7 +2195,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
             //备注
             log.info("上报网格化平台dto：" + dto);
-            sendDto.setBZXX(dto.getHandleAdvice());
+            sendDto.setBZXX(dto.getHandleAdvice()+" 诉求编码：" + itemEntity.getSerialNum());
             if (StringUtils.isNotBlank(dto.getHandleAdviceRemark())) {
                 sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark() + "\n诉求编码：" + itemEntity.getSerialNum());
             }
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 ebb559ca1..2c264939f 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,11 +1723,9 @@
         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,
+                case when (getworkminute(item.CREATED_TIME,now())  / 60 > 8) then '1'
+                when (getworkminute(item.CREATED_TIME,now())   / 60 > 6 and getworkminute(item.CREATED_TIME,now()) / 60 &lt;=8) then '2'
+                when (getworkminute(item.CREATED_TIME,now())   / 60 &lt;= 6) then '3' else '' end) as isRemind,
                 i.ITEM_STATE,
                 i.SERIAL_NUM,
                 i.GRID as gridName,
@@ -1754,8 +1752,7 @@
                     else ''
                     end as evaluationScoreName,
                 i.EVALUATION_CONTENT,
-                i.EVALUATION_TIME,
-                (case when (process.STATE = 1001 and HOUR( timediff( now(), i.CREATED_TIME) ) >= 24) then '1' else '' end) as isRemind
+                i.EVALUATION_TIME
         FROM epdc_item i
         left join (
                 select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state

From b60d134560ad15bb3216fe8da46ffa4f0e00d750 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 17:28:25 +0800
Subject: [PATCH 22/27] =?UTF-8?q?=E6=BB=B4=E6=BB=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/dto/item/result/ItemAppealPageResultDTO.java      | 2 +-
 1 file changed, 1 insertion(+), 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 1196d852b..bc79dfb5f 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
@@ -116,7 +116,7 @@ public class ItemAppealPageResultDTO implements Serializable {
     private String evaluationTime;
 
     /**
-     * 是否提醒社区处理(1:提示)
+     * 是否提醒社区处理(1:红灯，2黄灯，3绿灯)
      */
     private String isRemind;
 

From 2b5f4fac9bbf1b9c28560dbdbcc17132a65d6349 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 11 Oct 2022 17:34:01 +0800
Subject: [PATCH 23/27] bug

---
 .../src/main/resources/mapper/item/ItemDao.xml              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 2c264939f..a84801e4e 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,9 +1723,9 @@
         SELECT i.id,
                 i.NICK_NAME,
                 i.CREATED_TIME,
-                case when (getworkminute(item.CREATED_TIME,now())  / 60 > 8) then '1'
-                when (getworkminute(item.CREATED_TIME,now())   / 60 > 6 and getworkminute(item.CREATED_TIME,now()) / 60 &lt;=8) then '2'
-                when (getworkminute(item.CREATED_TIME,now())   / 60 &lt;= 6) then '3' else '' end) as isRemind,
+                case when (getworkminute(i.CREATED_TIME,now())  / 60 > 8) then '1'
+                when (getworkminute(i.CREATED_TIME,now())   / 60 > 6 and getworkminute(i.CREATED_TIME,now()) / 60 &lt;=8) then '2'
+                when (getworkminute(i.CREATED_TIME,now())   / 60 &lt;= 6) then '3' else '' end as isRemind,
                 i.ITEM_STATE,
                 i.SERIAL_NUM,
                 i.GRID as gridName,

From 52ac8396ab87467affd6794c55b99be4e7accb1f Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 11 Oct 2022 17:42:22 +0800
Subject: [PATCH 24/27] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenDeptEventEfficiencyDTO.java  |   5 +
 .../dto/screen/ScreenDeptEventStatDTO.java    |   5 +
 .../screen/form/DataStatisticsFormDTO.java    |  19 +++
 .../screen/form/EventStatisticsFormDTO.java   |  26 +++
 .../result/EventStatisticsResultDTO.java      |  44 ++++++
 .../dao/ScreenDeptEventEfficiencyDao.java     |  30 +++-
 .../screen/dao/ScreenDeptEventStatDao.java    |  33 ++++
 .../ScreenDeptEventEfficiencyEntity.java      |   7 +-
 .../entity/ScreenDeptEventStatEntity.java     |   5 +
 .../service/ScreenDeptEventStatService.java   |  66 ++------
 .../impl/ScreenDeptEventStatServiceImpl.java  | 132 ++++++++++------
 .../screen/ScreenDeptEventEfficiencyDao.xml   | 148 +++++++++++++++++-
 .../mapper/screen/ScreenDeptEventStatDao.xml  |  80 +++++++++-
 13 files changed, 493 insertions(+), 107 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/form/DataStatisticsFormDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/form/EventStatisticsFormDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventStatisticsResultDTO.java

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java
index 31a69a315..ceb52fe3d 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventEfficiencyDTO.java
@@ -63,6 +63,11 @@ public class ScreenDeptEventEfficiencyDTO implements Serializable {
      */
 	private String deptLevel;
 
+    /**
+     * 部门排序
+     */
+    private String deptSort;
+
     /**
      * 统计类型 年year，月month，日date
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java
index 197dacf3b..8aa2df9cd 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/ScreenDeptEventStatDTO.java
@@ -63,6 +63,11 @@ public class ScreenDeptEventStatDTO implements Serializable {
      */
 	private String deptLevel;
 
+    /**
+     * 部门排序
+     */
+    private String deptSort;
+
     /**
      * 统计年份yyyy
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/form/DataStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/form/DataStatisticsFormDTO.java
new file mode 100644
index 000000000..891bb0984
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/form/DataStatisticsFormDTO.java
@@ -0,0 +1,19 @@
+package com.elink.esua.epdc.dto.screen.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/10/11 10:21
+ */
+@Data
+public class DataStatisticsFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String statType;
+    private String statDate;
+    private String startDate;
+    private String endDate;
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/form/EventStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/form/EventStatisticsFormDTO.java
new file mode 100644
index 000000000..86008015e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/form/EventStatisticsFormDTO.java
@@ -0,0 +1,26 @@
+package com.elink.esua.epdc.dto.screen.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/10/11 10:21
+ */
+@Data
+public class EventStatisticsFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 部门ID
+     */
+    private String deptId;
+    /**
+     * 统计类型 默认 1，本月 2，本年 3，自定义区间 4
+     */
+    private String statType;
+    private String statDate;
+    private String startDate;
+    private String endDate;
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventStatisticsResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventStatisticsResultDTO.java
new file mode 100644
index 000000000..e58b56d97
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/screen/result/EventStatisticsResultDTO.java
@@ -0,0 +1,44 @@
+package com.elink.esua.epdc.dto.screen.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/10/11 10:21
+ */
+@Data
+public class EventStatisticsResultDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 部门ID
+     */
+    private String deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 事件总数
+     */
+    private Integer eventCount;
+
+    /**
+     * 民生诉求总数
+     */
+    private Integer livelihoodCount;
+
+    /**
+     * 发展诉求总数
+     */
+    private Integer developCount;
+
+    /**
+     * 执法诉求总数
+     */
+    private Integer lawCount;
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java
index 6fbca2850..ccbf3cc4e 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventEfficiencyDao.java
@@ -20,6 +20,9 @@ package com.elink.esua.epdc.modules.screen.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 大屏-事件结案数与效能评价统计
@@ -29,5 +32,30 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ScreenDeptEventEfficiencyDao extends BaseDao<ScreenDeptEventEfficiencyEntity> {
-	
+    /**
+     * 日统计
+     * @Param statDate
+     * @Return {@link List<ScreenDeptEventEfficiencyEntity>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 15:50
+     */
+    List<ScreenDeptEventEfficiencyEntity> getEventEfficiencyDaily(@Param("statDate") String statDate);
+
+    /**
+     * 月统计
+     * @Param statDate
+     * @Return {@link List<ScreenDeptEventEfficiencyEntity>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 15:50
+     */
+    List<ScreenDeptEventEfficiencyEntity> getEventEfficiencyMonthly(@Param("statDate") String statDate);
+
+    /**
+     * 年统计
+     * @Param statDate
+     * @Return {@link List<ScreenDeptEventEfficiencyEntity>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 15:50
+     */
+    List<ScreenDeptEventEfficiencyEntity> getEventEfficiencyYearly(@Param("statDate") String statDate);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventStatDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventStatDao.java
index a6f35ad8b..2b705dc58 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventStatDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenDeptEventStatDao.java
@@ -18,8 +18,14 @@
 package com.elink.esua.epdc.modules.screen.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.screen.ScreenDeptEventStatDTO;
+import com.elink.esua.epdc.dto.screen.form.EventStatisticsFormDTO;
+import com.elink.esua.epdc.dto.screen.result.EventStatisticsResultDTO;
 import com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventStatEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 大屏-事件汇总统计
@@ -29,5 +35,32 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ScreenDeptEventStatDao extends BaseDao<ScreenDeptEventStatEntity> {
+    /**
+     * 事件统计
+     *
+     * @Param statDate
+     * @Return {@link List< ScreenDeptEventStatDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 14:21
+     */
+    List<ScreenDeptEventStatEntity> getEventStat(@Param("statDate") String statDate);
+
+    /**
+     * 获取某天的统计结果
+     * @Param formDTO
+     * @Return {@link List<EventStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 15:31
+     */
+    List<EventStatisticsResultDTO> getEventStatByDay(EventStatisticsFormDTO formDTO);
+
+    /**
+     * 获取某个区间的统计结果，包括年，月，以及自定义区间
+     * @Param formDTO
+     * @Return {@link List<EventStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 15:32
+     */
+    List<EventStatisticsResultDTO> getEventStatByOther(EventStatisticsFormDTO formDTO);
 	
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventEfficiencyEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventEfficiencyEntity.java
index 038d7a2df..7a2c56cd7 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventEfficiencyEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventEfficiencyEntity.java
@@ -63,8 +63,13 @@ public class ScreenDeptEventEfficiencyEntity extends BaseEpdcEntity {
      */
 	private String deptLevel;
 
+	/**
+	 * 部门排序
+	 */
+	private String deptSort;
+
     /**
-     * 统计类型 年year，月month，日date
+     * 统计类型 年3，月2，日1
      */
 	private String statType;
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventStatEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventStatEntity.java
index 41f4d8806..9f55cd1b2 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventStatEntity.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/entity/ScreenDeptEventStatEntity.java
@@ -63,6 +63,11 @@ public class ScreenDeptEventStatEntity extends BaseEpdcEntity {
      */
 	private String deptLevel;
 
+	/**
+	 * 部门排序
+	 */
+	private String deptSort;
+
     /**
      * 统计年份yyyy
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventStatService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventStatService.java
index ef3dad2aa..9ef1be7f2 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventStatService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenDeptEventStatService.java
@@ -20,6 +20,9 @@ package com.elink.esua.epdc.modules.screen.service;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.dto.screen.ScreenDeptEventStatDTO;
+import com.elink.esua.epdc.dto.screen.form.DataStatisticsFormDTO;
+import com.elink.esua.epdc.dto.screen.form.EventStatisticsFormDTO;
+import com.elink.esua.epdc.dto.screen.result.EventStatisticsResultDTO;
 import com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventStatEntity;
 
 import java.util.List;
@@ -34,62 +37,23 @@ import java.util.Map;
 public interface ScreenDeptEventStatService extends BaseService<ScreenDeptEventStatEntity> {
 
     /**
-     * 默认分页
+     * 大屏数据统计
      *
-     * @param params
-     * @return PageData<ScreenDeptEventStatDTO>
-     * @author generator
-     * @date 2022-10-11
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 10:24
      */
-    PageData<ScreenDeptEventStatDTO> page(Map<String, Object> params);
+    void dataStatistics(DataStatisticsFormDTO formDTO);
 
     /**
-     * 默认查询
+     * 获取大屏数据
      *
-     * @param params
-     * @return java.util.List<ScreenDeptEventStatDTO>
-     * @author generator
-     * @date 2022-10-11
+     * @Param formDTO
+     * @Return {@link List<EventStatisticsResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 15:13
      */
-    List<ScreenDeptEventStatDTO> list(Map<String, Object> params);
+    List<EventStatisticsResultDTO> getEventStat(EventStatisticsFormDTO formDTO);
 
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return ScreenDeptEventStatDTO
-     * @author generator
-     * @date 2022-10-11
-     */
-    ScreenDeptEventStatDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2022-10-11
-     */
-    void save(ScreenDeptEventStatDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2022-10-11
-     */
-    void update(ScreenDeptEventStatDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2022-10-11
-     */
-    void delete(String[] ids);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java
index b945ce926..c92c7f523 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenDeptEventStatServiceImpl.java
@@ -20,21 +20,27 @@ package com.elink.esua.epdc.modules.screen.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.dto.screen.ScreenDeptEventStatDTO;
+import com.elink.esua.epdc.dto.screen.form.DataStatisticsFormDTO;
+import com.elink.esua.epdc.dto.screen.form.EventStatisticsFormDTO;
+import com.elink.esua.epdc.dto.screen.result.EventStatisticsResultDTO;
 import com.elink.esua.epdc.modules.screen.dao.ScreenDeptEventStatDao;
 import com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventStatEntity;
 import com.elink.esua.epdc.modules.screen.service.ScreenDeptEventStatService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * 大屏-事件汇总统计
@@ -45,57 +51,85 @@ import java.util.Map;
 @Service
 public class ScreenDeptEventStatServiceImpl extends BaseServiceImpl<ScreenDeptEventStatDao, ScreenDeptEventStatEntity> implements ScreenDeptEventStatService {
 
-
+    /**
+     * 数据统计
+     *
+     * @Param formDTO
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 10:24
+     */
     @Override
-    public PageData<ScreenDeptEventStatDTO> page(Map<String, Object> params) {
-        IPage<ScreenDeptEventStatEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, ScreenDeptEventStatDTO.class);
-    }
+    public void dataStatistics(DataStatisticsFormDTO formDTO) {
+        String statDate;
+        String statMonth;
+        String statYear;
+        if (StringUtils.isBlank(formDTO.getStatDate())) {
+            statDate = DateUtils.format(new Date(), DateUtils.DATE_PATTERN);
+            statMonth = statDate.substring(0,7);
+            statYear = statDate.substring(0,4);
+        } else {
+            statDate = formDTO.getStatDate();
+            statMonth = formDTO.getStatDate().substring(0,7);
+            statYear = formDTO.getStatDate().substring(0,4);
+        }
+        //统计总数
+        List<ScreenDeptEventStatEntity> list = baseDao.getEventStat(null);
+        //统计日增量
+        List<ScreenDeptEventStatEntity> incrList = baseDao.getEventStat(statDate);
+        Map<String, ScreenDeptEventStatEntity> map = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(incrList)) {
+            map = incrList.stream().collect(Collectors.toMap(ScreenDeptEventStatEntity::getDeptId, Function.identity(), (key1, key2) -> key2));
+        }
+        if (CollectionUtils.isNotEmpty(list)) {
+            Map<String, ScreenDeptEventStatEntity> finalMap = map;
+            list.forEach(item -> {
+                item.setStatYear(statYear);
+                item.setStatMonth(statMonth);
+                item.setStatDate(statDate);
+                if (finalMap.containsKey(item.getDeptId())) {
+                    ScreenDeptEventStatEntity incr = finalMap.get(item.getDeptId());
+                    item.setEventIncr(incr.getEventCount());
+                    item.setLivelihoodIncr(incr.getLivelihoodCount());
+                    item.setDevelopIncr(incr.getDevelopCount());
+                    item.setLawIncr(incr.getLawCount());
+                }
+            });
+            insertBatch(list);
+        }
 
-    @Override
-    public List<ScreenDeptEventStatDTO> list(Map<String, Object> params) {
-        List<ScreenDeptEventStatEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, ScreenDeptEventStatDTO.class);
-    }
-
-    private QueryWrapper<ScreenDeptEventStatEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<ScreenDeptEventStatEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
     }
 
+    /**
+     * 获取大屏数据
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link List< EventStatisticsResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2022/10/11 15:13
+     */
     @Override
-    public ScreenDeptEventStatDTO get(String id) {
-        ScreenDeptEventStatEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, ScreenDeptEventStatDTO.class);
+    public List<EventStatisticsResultDTO> getEventStat(EventStatisticsFormDTO formDTO) {
+        List<EventStatisticsResultDTO> result;
+        if (NumConstant.ONE_STR.equals(formDTO.getStatType())) {
+            //日期为当前日期前一天
+            formDTO.setStatDate(DateUtils.format(DateUtils.addDateDays(new Date(), -1), DateUtils.DATE_PATTERN));
+            result = baseDao.getEventStatByDay(formDTO);
+        } else if (NumConstant.TWO_STR.equals(formDTO.getStatType())) {
+            //日期为本月
+            formDTO.setStatDate(DateUtils.format(new Date(), DateUtils.DATE_PATTERN).substring(0, 7));
+            result = baseDao.getEventStatByOther(formDTO);
+        } else if (NumConstant.THREE_STR.equals(formDTO.getStatType())) {
+            //日期为本年
+            formDTO.setStatDate(DateUtils.format(new Date(), DateUtils.DATE_PATTERN).substring(0, 4));
+            result = baseDao.getEventStatByOther(formDTO);
+        } else {
+            //自定义区间
+            result = baseDao.getEventStatByOther(formDTO);
+        }
+
+        return result;
     }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(ScreenDeptEventStatDTO dto) {
-        ScreenDeptEventStatEntity entity = ConvertUtils.sourceToTarget(dto, ScreenDeptEventStatEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(ScreenDeptEventStatDTO dto) {
-        ScreenDeptEventStatEntity entity = ConvertUtils.sourceToTarget(dto, ScreenDeptEventStatEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml
index d3b46cb11..d4d3c18ac 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventEfficiencyDao.xml
@@ -2,7 +2,149 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.modules.screen.dao.ScreenDeptEventEfficiencyDao">
-
-
-
+    <select id="getEventEfficiencyDaily" resultType="com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity">
+        SELECT a.id                             AS deptId,
+               a.`name`                         AS deptName,
+               a.pid,
+               a.pids,
+               '1'                              AS statType,
+               a.type_key                       AS deptLevel,
+               a.sort                           AS deptSort,
+               IFNULL(SUM(b.eventCount), 0)     AS eventCount,
+               IFNULL(SUM(b.closedCount), 0)    AS closedCount,
+               IFNULL(SUM(b.responseCount), 0)  AS responseCount,
+               IFNULL(SUM(b.satisfiedCount), 0) AS satisfiedCount
+        FROM meta_sys_dept a
+        LEFT JOIN (
+            SELECT ALL_DEPT_IDS,
+                   COUNT(ID)                                            AS eventCount,
+                   COUNT(CASE ITEM_STATE WHEN '10' THEN ID END)         AS closedCount,
+                   COUNT(CASE WHEN processCount > 1 THEN ID END)        AS responseCount,
+                   COUNT(CASE WHEN EVALUATION_SCORE > 0 THEN ID END)    AS satisfiedCount
+            FROM epdc_item a
+            LEFT JOIN (
+                SELECT ITEM_ID, count(ID) AS 'processCount'
+                FROM epdc_item_handle_process
+                WHERE DEL_FLAG = '0'
+                GROUP BY ITEM_ID) b ON a.ID = b.ITEM_ID
+            WHERE DEL_FLAG = '0'
+                AND PEOPLE_FLAG is not null
+                <if test="statDate != null and statDate != ''">
+                AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') &lt;= #{statDate}
+                </if>
+            GROUP BY ALL_DEPT_IDS
+        ) b ON b.ALL_DEPT_IDS LIKE CONCAT('%', a.id, '%')
+        WHERE a.del_flag = '0'
+        GROUP BY a.id
+    </select>
+    <select id="getEventEfficiencyMonthly" resultType="com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity">
+        SELECT a.id                             AS deptId,
+               a.`name`                         AS deptName,
+               a.pid,
+               a.pids,
+               '2'                              AS statType,
+               a.type_key                       AS deptLevel,
+               a.sort                           AS deptSort,
+               IFNULL(SUM(b.eventCount), 0)     AS eventCount,
+               IFNULL(SUM(b.closedCount), 0)    AS closedCount,
+               IFNULL(SUM(b.responseCount), 0)  AS responseCount,
+               IFNULL(SUM(b.satisfiedCount), 0) AS satisfiedCount
+        FROM meta_sys_dept a
+                     LEFT JOIN (
+                SELECT ALL_DEPT_IDS,
+                       COUNT(ID)                                                                                      AS eventCount,
+                       COUNT(CASE
+                               WHEN ITEM_STATE = '10' AND DATE_FORMAT(UPDATED_TIME, '%Y-%m') = #{statDate}
+                                       THEN ID END)                                                                   AS closedCount,
+                       COUNT(CASE WHEN DATE_FORMAT(b.CREATED_TIME, '%Y-%m') = #{statDate} THEN ID END)                AS responseCount,
+                       COUNT(CASE
+                               WHEN DATE_FORMAT(EVALUATION_TIME, '%Y-%m') = #{statDate} AND EVALUATION_SCORE > 0
+                                       THEN ID END)                                                                   AS satisfiedCount
+                FROM epdc_item a
+                             LEFT JOIN (
+                        SELECT a.ITEM_ID,
+                               a.CREATED_TIME
+                        FROM (
+                             SELECT b.ID,
+                                    b.ITEM_ID,
+                                    b.CREATED_TIME
+                             FROM (SELECT ID
+                                   FROM epdc_item
+                                   WHERE DEL_FLAG = '0'
+                                     AND PEOPLE_FLAG IS NOT NULL
+                                     AND DATE_FORMAT(CREATED_TIME, '%Y-%m') = #{statDate}) a STRAIGHT_JOIN epdc_item_handle_process b
+                                          ON b.ITEM_ID = a.ID
+                                                  AND b.DEL_FLAG = '0'
+                             ) a
+                        WHERE a.ID = (
+                                SELECT ID
+                                FROM epdc_item_handle_process
+                                WHERE a.ITEM_ID = ITEM_ID
+                                ORDER BY CREATED_TIME
+                                LIMIT 1, 1
+                                )) b ON a.ID = b.ITEM_ID
+                WHERE DEL_FLAG = '0'
+                  AND DATE_FORMAT(a.CREATED_TIME, '%Y-%m') = #{statDate}
+                  AND PEOPLE_FLAG is not null
+                GROUP BY ALL_DEPT_IDS
+                ) b ON b.ALL_DEPT_IDS LIKE CONCAT('%', a.id, '%')
+        WHERE a.del_flag = '0'
+          AND a.type_key = 'street_party'
+        GROUP BY a.id
+    </select>
+    <select id="getEventEfficiencyYearly" resultType="com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventEfficiencyEntity">
+        SELECT a.id                             AS deptId,
+               a.`name`                         AS deptName,
+               a.pid,
+               a.pids,
+               '3'                              AS statType,
+               a.type_key                       AS deptLevel,
+               a.sort                           AS deptSort,
+               IFNULL(SUM(b.eventCount), 0)     AS eventCount,
+               IFNULL(SUM(b.closedCount), 0)    AS closedCount,
+               IFNULL(SUM(b.responseCount), 0)  AS responseCount,
+               IFNULL(SUM(b.satisfiedCount), 0) AS satisfiedCount
+        FROM meta_sys_dept a
+                     LEFT JOIN (
+                SELECT ALL_DEPT_IDS,
+                       COUNT(ID)                                                                                      AS eventCount,
+                       COUNT(CASE
+                               WHEN ITEM_STATE = '10' AND DATE_FORMAT(UPDATED_TIME, '%Y') = #{statDate}
+                                       THEN ID END)                                                                   AS closedCount,
+                       COUNT(CASE WHEN DATE_FORMAT(b.CREATED_TIME, '%Y') = #{statDate} THEN ID END)                AS responseCount,
+                       COUNT(CASE
+                               WHEN DATE_FORMAT(EVALUATION_TIME, '%Y') = #{statDate} AND EVALUATION_SCORE > 0
+                                       THEN ID END)                                                                   AS satisfiedCount
+                FROM epdc_item a
+                             LEFT JOIN (
+                        SELECT a.ITEM_ID,
+                               a.CREATED_TIME
+                        FROM (
+                             SELECT b.ID,
+                                    b.ITEM_ID,
+                                    b.CREATED_TIME
+                             FROM (SELECT ID
+                                   FROM epdc_item
+                                   WHERE DEL_FLAG = '0'
+                                     AND PEOPLE_FLAG IS NOT NULL
+                                     AND DATE_FORMAT(CREATED_TIME, '%Y') = #{statDate}) a STRAIGHT_JOIN epdc_item_handle_process b
+                                          ON b.ITEM_ID = a.ID
+                                                  AND b.DEL_FLAG = '0'
+                             ) a
+                        WHERE a.ID = (
+                                SELECT ID
+                                FROM epdc_item_handle_process
+                                WHERE a.ITEM_ID = ITEM_ID
+                                ORDER BY CREATED_TIME
+                                LIMIT 1, 1
+                                )) b ON a.ID = b.ITEM_ID
+                WHERE DEL_FLAG = '0'
+                  AND DATE_FORMAT(a.CREATED_TIME, '%Y') = #{statDate}
+                  AND PEOPLE_FLAG is not null
+                GROUP BY ALL_DEPT_IDS
+                ) b ON b.ALL_DEPT_IDS LIKE CONCAT('%', a.id, '%')
+        WHERE a.del_flag = '0'
+          AND a.type_key = 'street_party'
+        GROUP BY a.id
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml
index 5b53436cf..e3e01d470 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml
@@ -2,7 +2,83 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.modules.screen.dao.ScreenDeptEventStatDao">
+    <select id="getEventStat" resultType="com.elink.esua.epdc.modules.screen.entity.ScreenDeptEventStatEntity">
+        SELECT a.id                              AS deptId,
+               a.`name`                          AS deptName,
+               a.pid,
+               a.pids,
+               a.type_key                        AS deptLevel,
+               a.sort                            AS deptSort,
+               IFNULL(SUM(b.eventCount), 0)      AS 'eventCount',
+               IFNULL(SUM(b.livelihoodCount), 0) AS 'livelihoodCount',
+               IFNULL(SUM(b.developCount), 0)    AS 'developCount',
+               IFNULL(SUM(b.lawCount), 0)        AS 'lawCount'
+        FROM meta_sys_dept a
+        LEFT JOIN (
+            SELECT ALL_DEPT_IDS,
+                 SUM(total)      AS 'eventCount',
+                 SUM(livelihood) AS 'livelihoodCount',
+                 SUM(develop)    AS 'developCount',
+                 SUM(law)        AS 'lawCount'
+            FROM (
+               SELECT ALL_DEPT_IDS,
+                      total,
+                      CASE PEOPLE_FLAG WHEN '0' THEN total END AS 'livelihood',
+                      CASE PEOPLE_FLAG WHEN '1' THEN total END AS 'develop',
+                      CASE PEOPLE_FLAG WHEN '2' THEN total END AS 'law'
+               FROM (
+                    SELECT ALL_DEPT_IDS,
+                           PEOPLE_FLAG,
+                           count(ID) AS total
+                    FROM epdc_item
+                    WHERE DEL_FLAG = '0'
+                      AND PEOPLE_FLAG IS NOT NULL
+                      <if test="statDate != null and statDate != ''">
+                      AND DATE_FORMAT(CREATED_TIME, '%Y-%m-%d') &lt;= #{statDate}
+                      </if>
+                    GROUP BY ALL_DEPT_IDS, PEOPLE_FLAG
+               ) a
+            ) t
+            GROUP BY ALL_DEPT_IDS
+        ) b
+                 ON b.ALL_DEPT_IDS LIKE CONCAT('%', a.id, '%')
+        WHERE a.del_flag = '0'
+        GROUP BY a.id
+    </select>
+    <select id="getEventStatByDay" resultType="com.elink.esua.epdc.dto.screen.result.EventStatisticsResultDTO">
+        SELECT DEPT_ID,
+               DEPT_NAME,
+               EVENT_COUNT,
+               LIVELIHOOD_COUNT,
+               DEVELOP_COUNT,
+               LAW_COUNT
+        FROM screen_dept_event_stat
+        WHERE PID = #{deptId}
+          AND STAT_DATE = #{startDate}
+        ORDER BY DEPT_SORT ASC,
+                 CONVERT(DEPT_NAME USING gbk) ASC
+    </select>
 
-
-
+    <select id="getEventStatByOther" resultType="com.elink.esua.epdc.dto.screen.result.EventStatisticsResultDTO">
+        SELECT DEPT_ID,
+               DEPT_NAME,
+               SUM(EVENT_INCR)      EVENT_COUNT,
+               SUM(LIVELIHOOD_INCR) LIVELIHOOD_COUNT,
+               SUM(DEVELOP_INCR)    DEVELOP_COUNT,
+               SUM(LAW_INCR)        LAW_COUNT
+        FROM screen_dept_event_stat
+        WHERE PID = #{deptId}
+           <if test="'2' == statType">
+                AND STAT_MONTH = #{statDate}
+           </if>
+           <if test="'3' == statType">
+                AND STAT_YEAR = #{statDate}
+           </if>
+           <if test="'4' == statType">
+                AND STAT_DATE &gt;= #{startDate}
+                AND STAT_DATE &lt;= #{endDate}
+           </if>
+        ORDER BY DEPT_SORT ASC,
+                 CONVERT(DEPT_NAME USING gbk) ASC
+    </select>
 </mapper>
\ No newline at end of file

From da251546f234fd855eafd72d66fa0e727aed0996 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 12 Oct 2022 09:11:16 +0800
Subject: [PATCH 25/27] =?UTF-8?q?=E6=95=B0=E7=BB=84=E8=B6=8A=E7=95=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a387e6e91..78180a5a6 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
@@ -1286,7 +1286,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         for (ItemHandleProgressResultDTO dto : list) {
             String advice = dto.getAdvice();
             // 对包含【h_s】的数据进行重新组装
-            if (advice.contains("h_s")) {
+            if (advice.contains("h_s") && advice.contains("   办理人：")) {
                 String hsStr = advice.substring(advice.indexOf("h_s"), advice.length());
                 String adviceOld = advice.substring(0, advice.indexOf("   办理人："));
                 String adviceNew = adviceOld + hsStr;

From 39c49e9e83ed885af8fe328f8f588973904ec185 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Wed, 12 Oct 2022 10:25:29 +0800
Subject: [PATCH 26/27] =?UTF-8?q?=E8=AF=89=E6=B1=82=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/controller/ItemController.java       | 11 ++++++++++
 .../modules/item/service/ItemService.java     |  2 ++
 .../item/service/impl/ItemServiceImpl.java    | 15 +++++++++++++
 .../main/resources/mapper/item/ItemDao.xml    | 21 +++++++++++++++++--
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
index c15910e6f..c3125dd5d 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
@@ -414,5 +414,16 @@ public class ItemController {
         ValidatorUtils.validateEntity(formDto);
         return itemService.pushItemProcess(formDto);
     }
+
+    /**
+     * @describe: 数据统计页面-北上诉求列表
+     * 逻辑同方法 getItemAppealPage
+     */
+    @GetMapping("getItemStatisListPage")
+    public Result<PageData<ItemAppealPageResultDTO>> getItemStatisListPage(@RequestParam Map<String, Object> params){
+        PageData<ItemAppealPageResultDTO> page = itemService.getItemStatisListPage(params);
+        return new Result<PageData<ItemAppealPageResultDTO>>().ok(page);
+    }
+
 }
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
index e92c4c20e..ac35c1928 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
@@ -616,4 +616,6 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @date 2022/9/19 10:51
      */
     String getSqid(String itemId);
+
+    PageData<ItemAppealPageResultDTO> getItemStatisListPage(Map<String, Object> params);
 }
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 78180a5a6..4964ce799 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
@@ -3917,4 +3917,19 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return "";
     }
 
+    /**
+     * @describe: 数据统计页面-北上诉求列表
+     * 逻辑同方法 getItemAppealPage
+     */
+    @Override
+    public PageData<ItemAppealPageResultDTO> getItemStatisListPage(@RequestParam Map<String, Object> params) {
+        UserDetail user = SecurityUser.getUser();
+        IPage<ItemAppealPageResultDTO> page = getPage(params);
+        List<ItemAppealPageResultDTO> list = baseDao.getItemAppealPage(params);
+        Map<String, Long> map = listItemHandleDept();
+        list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId())));
+        return new PageData<>(list, page.getTotal());
+
+    }
+
 }
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 dc46f0273..9bb4b176e 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
@@ -1812,6 +1812,23 @@
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             AND DATE_FORMAT( i.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
         </if>
+
+        <!-- 数据统计页面列表查询条件 -->
+        <if test="deptId != null and deptId != ''">
+            AND i.all_dept_ids LIKE concat('%', trim(#{deptId}), '%')
+        </if>
+        <if test="peopleFlag != null and peopleFlag != ''">
+            AND i.people_flag = #{peopleFlag}
+        </if>
+        <if test="statDate != null and statDate != ''">
+            AND DATE_FORMAT(i.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{statDate}
+        </if>
+        <if test="statMonth != null and statMonth != ''">
+            AND DATE_FORMAT(i.created_time,'%Y-%m') = #{statMonth}
+        </if>
+        <if test="statYear != null and statYear != ''">
+            AND DATE_FORMAT(i.created_time,'%Y') = #{statYear}
+        </if>
         order by i.CREATED_TIME desc
     </select>
 
@@ -2178,8 +2195,8 @@
     <select id="getStatisItemList" resultType="com.elink.esua.epdc.dto.item.ItemDTO">
         SELECT
         getworkminute(CREATED_TIME,'2022-10-08 12:00:00')a,
-        sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')<=120 then 1 else 0 end))b,
-        sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')>120 and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')<=360 then 1 else 0 end))c,
+        sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')<![CDATA[ <= ]]>120 then 1 else 0 end))b,
+        sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')>120 and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')<![CDATA[ <= ]]>360 then 1 else 0 end))c,
         sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')>=360 then 1 else 0 end))d
         FROM epdc_item ei
         WHERE

From 2cbaab89710d8df4fd8363324af5015f7ddf2759 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Wed, 12 Oct 2022 10:41:26 +0800
Subject: [PATCH 27/27] =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/modules/item/dao/ItemDao.java   |  1 -
 .../controller/ScreenItemController.java      | 10 -----
 .../modules/screen/service/ScreenService.java |  1 -
 .../service/impl/ScreenServiceImpl.java       | 34 ---------------
 .../main/resources/mapper/item/ItemDao.xml    | 43 ++-----------------
 5 files changed, 4 insertions(+), 85 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
index 04004d699..71b892cba 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
@@ -478,5 +478,4 @@ public interface ItemDao extends BaseDao<ItemEntity> {
 
     ItemDailyStatisResultDTO itemDailyStatis(ItemDailyStatisFormDTO formDTO);
 
-    List<ItemDTO> getStatisItemList(ItemDailyStatisFormDTO formDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
index 59fd60c6a..4358e0b4c 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenItemController.java
@@ -53,14 +53,4 @@ public class ScreenItemController {
         return new Result<ItemDailyStatisResultDTO>().ok(screenService.itemDailyStatis(formDTO));
     }
 
-    /**
-     * 数据统计-各诉求红黄绿灯事件数
-     */
-    @PostMapping("itemlampdailystatis")
-    public Result<ItemDailyStatisResultDTO> itemLampDailyStatis(@RequestBody ItemDailyStatisFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, AddGroup.class);
-        return new Result<ItemDailyStatisResultDTO>().ok(screenService.itemLampDailyStatis(formDTO));
-    }
-
-
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
index 7427d79cb..a9abfa5b2 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenService.java
@@ -27,5 +27,4 @@ public interface ScreenService {
 
     ItemDailyStatisResultDTO itemDailyStatis(ItemDailyStatisFormDTO formDTO);
 
-    ItemDailyStatisResultDTO itemLampDailyStatis(ItemDailyStatisFormDTO formDTO);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
index 01dd64a9e..8372f8c11 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenServiceImpl.java
@@ -19,7 +19,6 @@ package com.elink.esua.epdc.modules.screen.service.impl;
 
 import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO;
 import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO;
-import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.modules.item.dao.ItemDao;
 import com.elink.esua.epdc.modules.screen.service.ScreenService;
 import org.apache.commons.lang3.StringUtils;
@@ -29,7 +28,6 @@ import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 项目统计相关接口
@@ -63,37 +61,5 @@ public class ScreenServiceImpl implements ScreenService {
         return resultDTO;
     }
 
-    /**
-     * 数据统计-各诉求红黄绿灯事件数
-     */
-    @Override
-    public ItemDailyStatisResultDTO itemLampDailyStatis(ItemDailyStatisFormDTO formDTO) {
-        ItemDailyStatisResultDTO resultDTO = new ItemDailyStatisResultDTO();
-        resultDTO.setDeptId(formDTO.getDeptId());
-        resultDTO.setPeopleFlag(formDTO.getPeopleFlag());
-        //1.入参时间有值的按时间查，没值的默认查截止到昨天的数据
-        //1.入参时间有值的按时间查，没值的默认查截止到昨天的数据
-        if(StringUtils.isEmpty(formDTO.getStatDate())&&StringUtils.isEmpty(formDTO.getStatMonth())&&StringUtils.isEmpty(formDTO.getStatYear())){
-            DateTime dateTime = new DateTime(new Date());
-            Date d = dateTime.plusDays(-1).toDate();
-            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-            formDTO.setStatDate(df.format(d));
-        }
-        //2.按条件查询业务数据
-        List<ItemDTO> list = itemDao.getStatisItemList(formDTO);
-        //3.统计红黄绿灯类型，封装数据
-        int redTotal = 0;
-        int yellowTotal = 0;
-        int greenTotal = 0;
-        Date date = new Date();
-        for (ItemDTO i : list){
-
-        }
-        resultDTO.setRedTotal(redTotal);
-        resultDTO.setYellowTotal(yellowTotal);
-        resultDTO.setGreenTotal(greenTotal);
-        return resultDTO;
-    }
-
 
 }
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 9bb4b176e..aa638d581 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
@@ -2142,14 +2142,14 @@
             SUM(a.ITEM_STATE='10')closedTotal,
             sum((case when a.ITEM_STATE='0' and b.STATE = 1001 then 1 else 0 end))pendingTotal,
             sum((case when a.ITEM_STATE='0' and b.STATE != 1001 then 1 else 0 end))processingTotal,
-            sum((case when a.ITEM_STATE='0' and getworkminute(a.created_time,'2022-10-08 12:00:00')>=360 then 1 else 0 end))redTotal,
+            sum((case when a.ITEM_STATE='0' and getworkminute(a.created_time,'2022-10-08 12:00:00')>=480 then 1 else 0 end))redTotal,
             sum(
                 (case when a.ITEM_STATE='0'
-                           and getworkminute(a.created_time,'2022-10-08 12:00:00')>120
-                           and getworkminute(a.created_time,'2022-10-08 12:00:00')<![CDATA[ <= ]]>360
+                           and getworkminute(a.created_time,'2022-10-08 12:00:00')>360
+                           and getworkminute(a.created_time,'2022-10-08 12:00:00')<![CDATA[ <= ]]>480
                 then 1 else 0 end)
                 )yellowTotal,
-            sum((case when a.ITEM_STATE='0' and getworkminute(a.created_time,'2022-10-08 12:00:00')<![CDATA[ <= ]]>120 then 1 else 0 end))greenTotal
+            sum((case when a.ITEM_STATE='0' and getworkminute(a.created_time,'2022-10-08 12:00:00')<![CDATA[ <= ]]> 360 then 1 else 0 end))greenTotal
         FROM
             epdc_item a
         LEFT JOIN (
@@ -2192,39 +2192,4 @@
         </if>
     </select>
 
-    <select id="getStatisItemList" resultType="com.elink.esua.epdc.dto.item.ItemDTO">
-        SELECT
-        getworkminute(CREATED_TIME,'2022-10-08 12:00:00')a,
-        sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')<![CDATA[ <= ]]>120 then 1 else 0 end))b,
-        sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')>120 and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')<![CDATA[ <= ]]>360 then 1 else 0 end))c,
-        sum((case when ITEM_STATE='0' and getworkminute(CREATED_TIME,'2022-10-08 12:00:00')>=360 then 1 else 0 end))d
-        FROM epdc_item ei
-        WHERE
-            ei.del_flag = '0'
-        AND ei.is_people = '1'
-        AND ei.event_id IS NULL
-        AND ei.s IS NULL
-        <if test="deptId != null and deptId != ''">
-            AND ei.all_dept_ids LIKE concat('%', trim(#{deptId}), '%')
-        </if>
-        <if test="peopleFlag != null and peopleFlag != ''">
-            AND ei.people_flag = #{peopleFlag}
-        </if>
-        <if test="statDate != null and statDate != ''">
-            AND DATE_FORMAT(ei.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{statDate}
-        </if>
-        <if test="startTime != null and startTime != ''">
-            AND DATE_FORMAT(ei.created_time,'%Y-%m-%d') >= #{startTime}
-        </if>
-        <if test="endTime != null and endTime != ''">
-            AND DATE_FORMAT(ei.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{endTime}
-        </if>
-        <if test="statMonth != null and statMonth != ''">
-            AND DATE_FORMAT(ei.created_time,'%Y-%m') = #{statMonth}
-        </if>
-        <if test="statYear != null and statYear != ''">
-            AND DATE_FORMAT(ei.created_time,'%Y') = #{statYear}
-        </if>
-    </select>
-
 </mapper>