From f514de44efb73cc57f99abeab2c7b77ed1a13acc Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Thu, 20 Oct 2022 10:53:22 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 980cfcaa5..442af207c 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
@@ -2294,6 +2294,23 @@
         <if test="code != null and code != ''">
             AND SUBSTRING_INDEX(i.category_full_code,'-',1) = #{code}
         </if>
+        <choose>
+            <when test='lamp != null and lamp == "red"'>
+                and i.item_state='0' and getworkminute(i.created_time, now()) > 480
+            </when>
+            <when test='lamp != null and lamp == "yellow"'>
+                and i.item_state='0'
+                and getworkminute(i.created_time, now()) > 360
+                and getworkminute(i.created_time, now()) <![CDATA[ <= ]]> 480
+            </when>
+            <when test='lamp != null and lamp == "green"'>
+                and i.item_state='0' and getworkminute(i.created_time, now()) <![CDATA[ <= ]]> 360
+            </when>
+            <otherwise></otherwise>
+        </choose>
+        <if test="evaluationScore != null and evaluationScore != ''">
+            AND i.evaluation_score = #{evaluationScore}
+        </if>
         order by i.created_time DESC
     </select>
 

From e4995a2897212df0bee17b78121efd49479394c0 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Thu, 20 Oct 2022 11:07:30 +0800
Subject: [PATCH 02/13] .

---
 .../src/main/resources/mapper/item/ItemDao.xml               | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 442af207c..1f95dab2a 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
@@ -2291,9 +2291,12 @@
             AND DATE_FORMAT(i.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{statDate}
         </if>
         <!-- 增加入参code 在类别分析页面点击饼图时需要展示列表因此增加入参共用列表接口 王gf-->
-        <if test="code != null and code != ''">
+        <if test='isElse != null and isElse == "1" and code != null and code != ""'>
             AND SUBSTRING_INDEX(i.category_full_code,'-',1) = #{code}
         </if>
+        <if test='isElse != null and isElse == "0" and code != null and code != ""'>
+            AND SUBSTRING_INDEX(i.category_full_code,'-',2) = #{code}
+        </if>
         <choose>
             <when test='lamp != null and lamp == "red"'>
                 and i.item_state='0' and getworkminute(i.created_time, now()) > 480

From 7792d0662255677d9405cad3c20c20c97d34be1e Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 20 Oct 2022 11:11:26 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/item/form/ScreenTotalFormDTO.java     |  5 ++
 .../result/CategoryAnalysisPieResultDTO.java  |  1 +
 .../esua/epdc/modules/item/dao/ItemDao.java   |  3 +-
 .../item/service/impl/ItemServiceImpl.java    | 54 ++++++++++++++++++-
 .../main/resources/mapper/item/ItemDao.xml    | 33 ++++++++++--
 5 files changed, 89 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java
index fe5b319e9..cbc84742a 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ScreenTotalFormDTO.java
@@ -40,6 +40,11 @@ public class ScreenTotalFormDTO implements Serializable {
      */
     private String yearMonth;
 
+    /**
+     * 是否查询其他数据(0:否；1：是)
+     */
+    private String isElse;
+
     /**
      * 时间数组
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryAnalysisPieResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryAnalysisPieResultDTO.java
index 3e0294bec..6c87fb9aa 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryAnalysisPieResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryAnalysisPieResultDTO.java
@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.item.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
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 e944a2eaa..ccce9b84f 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
@@ -503,7 +503,8 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @param formDTO
      * @return
      */
-    List<CategoryAnalysisPieResultDTO> categoryAnalysis(ScreenTotalFormDTO formDTO);
+    List<CategoryAnalysisPieResultDTO> categoryAnalysisFirst(ScreenTotalFormDTO formDTO);
+    List<CategoryAnalysisPieResultDTO> categoryAnalysisSecond(ScreenTotalFormDTO formDTO);
 
     /**
      * 满意度统计
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 7a5544165..e99c0e137 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
@@ -3937,10 +3937,60 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     @Override
     public List<CategoryAnalysisPieResultDTO> categoryAnalysis(ScreenTotalFormDTO formDTO) {
+        // 返回值
+        List<CategoryAnalysisPieResultDTO> resultList = new ArrayList<CategoryAnalysisPieResultDTO>();
+
+        if("0".equals(formDTO.getIsElse())){
+            // 城市综合
+            // 定义初始【城市综合】5大类
+            List<String> cityCompre = new ArrayList<>();
+            cityCompre.add("城市综合-交通运输");
+            cityCompre.add("城市综合-城市管理");
+            cityCompre.add("城市综合-城管执法");
+            cityCompre.add("城市综合-环境保护");
+            cityCompre.add("城市综合-居民生活");
+            // 获取分类全部数据
+            List<CategoryAnalysisPieResultDTO> list = baseDao.categoryAnalysisSecond(formDTO);
+            // 其他总数
+            Integer elseValue = 0;
+            for(CategoryAnalysisPieResultDTO dto : list){
+                if(cityCompre.contains(dto.getName())){
+                    resultList.add(dto);
+                }else{
+                    elseValue += Integer.parseInt(dto.getValue());
+                }
+
+            }
+            // 定义【其他】
+            CategoryAnalysisPieResultDTO elseCategory = new CategoryAnalysisPieResultDTO();
+            elseCategory.setCode("其他");
+            elseCategory.setName("其他");
+            elseCategory.setValue(elseValue.toString());
+            resultList.add(elseCategory);
+
+        }else{
+            // 其他
+            // 总数
+            Integer total = 0;
+            List<CategoryAnalysisPieResultDTO> list = baseDao.categoryAnalysisFirst(formDTO);
+            for(CategoryAnalysisPieResultDTO dto1 : list){
+                total += Integer.parseInt(dto1.getValue());
+            }
+            for(CategoryAnalysisPieResultDTO dto2 : list){
+                if(!"城市综合".equals(dto2.getName())){
 
-        List<CategoryAnalysisPieResultDTO> list = baseDao.categoryAnalysis(formDTO);
+                    BigDecimal value = BigDecimal.valueOf(Integer.parseInt(dto2.getValue()));
+                    BigDecimal totalBig = BigDecimal.valueOf(total);
+                    BigDecimal proportion = value .divide(totalBig,2, RoundingMode.HALF_UP);
+                    dto2.setProportion(proportion + "%");
+                    resultList.add(dto2);
 
-        return list;
+                }
+            }
+
+        }
+
+        return resultList;
     }
 
     @Override
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 193165d63..65358d298 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
@@ -2364,7 +2364,7 @@
         order by i.created_time DESC
     </select>
 
-    <select id="categoryAnalysis" resultType="com.elink.esua.epdc.dto.item.result.CategoryAnalysisPieResultDTO"
+    <select id="categoryAnalysisFirst" resultType="com.elink.esua.epdc.dto.item.result.CategoryAnalysisPieResultDTO"
             parameterType="com.elink.esua.epdc.dto.item.form.ScreenTotalFormDTO">
         select
             SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) as name,
@@ -2388,6 +2388,30 @@
         group by SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1)
         ORDER BY count(item.ID) desc
     </select>
+    <select id="categoryAnalysisSecond" resultType="com.elink.esua.epdc.dto.item.result.CategoryAnalysisPieResultDTO"
+            parameterType="com.elink.esua.epdc.dto.item.form.ScreenTotalFormDTO">
+        select
+        SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',2) as name,
+        SUBSTRING_INDEX(item.CATEGORY_FULL_CODE,'-',2) as code,
+        count(item.ID) as value
+        from epdc_item item
+        where item.DEL_FLAG = '0'
+        and item.IS_PEOPLE = '1'
+        and item.EVENT_ID is null
+        and item.ISSUE_ID is null
+        and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="deptId != null and deptId != ''">
+            AND find_in_set(#{deptId},item.ALL_DEPT_IDS)
+        </if>
+        <if test="peopleFlag != null and peopleFlag != ''">
+            AND item.PEOPLE_FLAG = #{peopleFlag}
+        </if>
+        group by SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',2)
+        ORDER BY count(item.ID) desc
+    </select>
 
     <select id="evaluationTotal" resultType="com.elink.esua.epdc.dto.item.result.EvaluationTotalPieResultDTO"
             parameterType="com.elink.esua.epdc.dto.item.form.ScreenTotalFormDTO">
@@ -2423,12 +2447,13 @@
             parameterType="com.elink.esua.epdc.dto.item.form.ScreenTotalFormDTO">
         select
             DATE_FORMAT(item.CREATED_TIME,'%Y-%m-%d') as time,
-            count(item.EVALUATION_SCORE = 0 or null) as bmy,
-            count(item.EVALUATION_SCORE = 1 or null) as jbmy,
-            count(item.EVALUATION_SCORE = 2 or null) as fcmy
+            ROUND(count(item.EVALUATION_SCORE = 0 or null) / count(item.ID) * 100,1) as bmy,
+            ROUND(count(item.EVALUATION_SCORE = 1 or null) / count(item.ID) * 100,1) as jbmy,
+            ROUND(count(item.EVALUATION_SCORE = 2 or null) / count(item.ID) * 100,1) as fcmy
         from epdc_item item
         where item.DEL_FLAG = '0'
         and item.IS_PEOPLE = '1'
+        and item.ITEM_STATE = '10'
         and item.EVENT_ID is null
         and item.ISSUE_ID is null
         and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'

From 8ba85f6e39a013a5391c72e1b5000d49baa6afe0 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 20 Oct 2022 16:47:22 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 6dfd4e324..6ab46cefe 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
@@ -2826,8 +2826,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         } else if (ItemGridPlatformHandleStatusEnum.HANDLE_ZCZ.getValue() == dto.getState() || ItemGridPlatformHandleStatusEnum.HANDLE_XSSQ.getValue() == dto.getState()) {
             pushToCityGridService.again(dto);//再处置、向上申请时判断上个节点是退回则(2.9 退件审核)结果为通过
         } else if (ItemGridPlatformHandleStatusEnum.HANDLE_DB.getValue() == dto.getState()) {
-            //诉求督办
-            pushToCityGridService.appealSupervise(dto);
+            //诉求督办10.20废弃
+//            pushToCityGridService.appealSupervise(dto);
         } else if (ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.getValue() == dto.getState()) {
             //初验申请
             pushToCityGridService.earlyInspectionApply(dto);

From 22ca57ef970f91c56a29ab6af7c33e13f3302533 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 20 Oct 2022 17:29:55 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E7=BB=93=E6=A1=88=E6=8B=89=E5=8F=96?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AD=98=E4=B8=80=E5=A5=97=E7=BB=93?=
 =?UTF-8?q?=E6=A1=88=E7=94=B3=E8=AF=B7=E5=9B=BE=E7=89=87?=
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, 14 insertions(+)

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 6dfd4e324..7e9beff35 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
@@ -3694,6 +3694,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             return new Result().error("未查到相关事件信息");
         }
         // 插入项目处理进度表
+        String firstHandleId = "";
         ItemHandleProcessDTO itemHandleProcessDto = new ItemHandleProcessDTO();
         itemHandleProcessDto.setId(UUID.randomUUID().toString().replaceAll("-", ""));
         itemHandleProcessDto.setItemId(itemPlat.getReferenceId());
@@ -3742,9 +3743,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                     if (firsthandleProcess == null) {
                         itemHandleProcessDto.setOutHandleAdvice("办理人：" + item.getHandlePeopleName() + "，联系电话：" + item.getHandlePeopleMobile());
                     } else {
+                        firstHandleId = firsthandleProcess.getId();
                         itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice() + "h_s办理人：" + item.getHandlePeopleName() + "，联系电话：" + item.getHandlePeopleMobile());
                     }
                 } else {
+                    firstHandleId = firsthandleProcess.getId();
                     itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice() + "h_s办理人：" + item.getHandlePeopleName() + "，联系电话：" + item.getHandlePeopleMobile());
                 }
 
@@ -3772,6 +3775,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemHandleProcessDto.setCreatedTime(new Date());
         itemHandleProcessDto.setUpdatedTime(new Date());
         itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto);
+
+        if(StringUtils.isNotBlank(firstHandleId)){
+            // 插入第一级结案申请时的图片
+            List<ImgEntity> imageList = imgDao.selectListByRefeId(firstHandleId);
+            for(ImgEntity imgEntity : imageList){
+                imgEntity.setId(null);
+                imgEntity.setReferenceId(itemHandleProcessDto.getId());
+                imgDao.insert(imgEntity);
+            }
+        }
+
         try {
             //网格化平台结案/驳回操作增加的推送数据到市平台逻辑报错不能影响原有程序流程
             if ("1".equals(formDto.getState())) {

From 19312e271ebd0824cfded1269338b1f80912dc20 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 20 Oct 2022 17:34:40 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 27b1fc53f..12bcc43aa 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
@@ -2700,6 +2700,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             wrapper.eq("item_id", itemId);
             wrapper.eq("created_by", "网格化平台");
             wrapper.eq("del_flag", NumConstant.ZERO_STR);
+            // 任何主动在流程表里插入的网格化操作都应该在过滤列表中，为了能够正常拉取网格化流程数据
             wrapper.notIn("state", ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue(), ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue());
             wrapper.orderByDesc("created_time");
             wrapper.last("limit 1");

From 74a07ffe56c7d3e94325a2a23f5a5a0358eaaa44 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 21 Oct 2022 09:49:36 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=BA=94=E5=89=8D=E7=AB=AF=E8=A6=81?=
 =?UTF-8?q?=E6=B1=82=E5=9C=B0=E5=9B=BE=E6=8E=A5=E5=8F=A3=E7=BB=8F=E7=BA=AC?=
 =?UTF-8?q?=E5=BA=A6=E6=94=B9=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/item/ItemDao.xml        | 11 ++++++++---
 1 file changed, 8 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 ad69cad50..fe74a0858 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
@@ -2464,8 +2464,11 @@
             a.id id,
             a.item_content itemContent,
             a.issue_latitude latitude,
-            a.issue_longitude longitude,
-            round((st_distance_sphere(point(#{longitude}, #{latitude}), point(a.ISSUE_LONGITUDE, a.ISSUE_LATITUDE))) / 1000 ,1) as km
+            a.issue_longitude longitude
+            <if test="longitude != null and longitude != '' and latitude != null and latitude != ''">
+                ,
+                round((st_distance_sphere(point(#{longitude}, #{latitude}), point(a.ISSUE_LONGITUDE, a.ISSUE_LATITUDE))) / 1000 ,1) as km
+            </if>
         FROM
             epdc_item a
         INNER JOIN (
@@ -2491,7 +2494,9 @@
         <if test="statDate != null and statDate != ''">
             AND DATE_FORMAT(a.created_time,'%Y-%m-%d') <![CDATA[ <= ]]> #{statDate}
         </if>
-        HAVING km <![CDATA[ <= ]]> 10
+        <if test="longitude != null and longitude != '' and latitude != null and latitude != ''">
+            HAVING km <![CDATA[ <= ]]> 10
+        </if>
         ORDER BY
             a.created_time DESC,
             a.all_dept_ids ASC

From 4ac3cfa8576d55dd3c20d483e2bf41cdcb44b194 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 21 Oct 2022 10:07:28 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/item/service/impl/ItemServiceImpl.java     | 1 +
 .../src/main/resources/mapper/item/ItemDao.xml              | 6 +++---
 2 files changed, 4 insertions(+), 3 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 12bcc43aa..745070a43 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
@@ -3968,6 +3968,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             Integer elseValue = 0;
             for(CategoryAnalysisPieResultDTO dto : list){
                 if(cityCompre.contains(dto.getName())){
+                    dto.setName(dto.getName().replace("城市综合-",""));
                     resultList.add(dto);
                 }else{
                     elseValue += Integer.parseInt(dto.getValue());
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 ad69cad50..812fb5ef1 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
@@ -2432,9 +2432,9 @@
             parameterType="com.elink.esua.epdc.dto.item.form.ScreenTotalFormDTO">
         select
         DATE_FORMAT(item.CREATED_TIME,'%Y-%m') as time,
-        count(item.EVALUATION_SCORE = 0 or null) as bmy,
-        count(item.EVALUATION_SCORE = 1 or null) as jbmy,
-        count(item.EVALUATION_SCORE = 2 or null) as fcmy
+        ROUND(count(item.EVALUATION_SCORE = 0 or null) / count(item.ID) * 100,1) as bmy,
+        ROUND(count(item.EVALUATION_SCORE = 1 or null) / count(item.ID) * 100,1) as jbmy,
+        ROUND(count(item.EVALUATION_SCORE = 2 or null) / count(item.ID) * 100,1) as fcmy
         from epdc_item item
         where item.DEL_FLAG = '0'
         and item.IS_PEOPLE = '1'

From b7d792441746e3aa4943d7ff53b1b6ccd75ecc64 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 21 Oct 2022 10:43:46 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E7=BB=93=E6=A1=88=E5=92=8C=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=AD=98=E5=82=A8=E6=8E=A5=E6=94=B6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/service/impl/ItemServiceImpl.java    | 59 +------------------
 1 file changed, 3 insertions(+), 56 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 745070a43..373dd8f3e 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
@@ -3726,17 +3726,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 //吹哨
                 itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice() + "h_s办理人：" + item.getHandlePeopleName() + "，联系电话：" + item.getHandlePeopleMobile());
             } else {
-                /*
-                //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！
-                ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId());
-                // 结案去掉本系统拼接的办理人信息（2022-09-30 修改 wgf）
-                String handleAdvice = "";
-                if(StringUtils.isNotBlank(firsthandleProcess.getHandleAdvice())){
-                    handleAdvice = firsthandleProcess.getHandleAdvice();
-                    handleAdvice= handleAdvice.substring(0,handleAdvice.lastIndexOf("   办理人："));
-                }
-                itemHandleProcessDto.setOutHandleAdvice(handleAdvice+"h_s办理人："+item.getHandlePeopleName()+"，联系电话："+item.getHandlePeopleMobile());
-*/
                 //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！没有结案申请就取网格化结案状态流程数据
                 ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId(), ItemGridPlatformHandleStatusEnum.HANDLE_SQ.getValue());
                 if (firsthandleProcess == null) {
@@ -3810,8 +3799,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
         successFlag = YesOrNoEnum.YES.value();
         // 保存接口调用日志
+        String message = formDto.getP_recId();
+        message = message + ":" + formDto;
         this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(),
-                ApiConstants.acceptItemProcess, successFlag, formDto.getP_recId(), returnMsgBody);
+                ApiConstants.acceptItemProcess, successFlag, message, returnMsgBody);
         return new Result().ok("操作成功");
     }
 
@@ -3847,49 +3838,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return 0 == process.getState() || 15 == process.getState();
     }
 
-    /**
-     * 领域类别处理
-     *
-     * @param
-     * @return void
-     * @author zhy
-     * @date 2022/9/6 21:14
-     */
-    private void lbHandle(SendEventFormDto dto, String secondCategory) {
-        if (StringUtils.isNotBlank(secondCategory)) {
-            int length = secondCategory.length();
-            if (length % 2 == 0) {
-                // 偶数
-            } else {
-                // 奇数
-                secondCategory = "0" + secondCategory;
-            }
-            if (length > 2) {
-                // 每隔2位加一个逗号
-                secondCategory = secondCategory.replaceAll("(.{2})", "$1,");
-                String[] categoryList = secondCategory.split(",");
-                if (categoryList.length == NumConstant.TWO) {
-                    // 事件大类
-                    dto.setSJDL(categoryList[1]);
-                } else if (categoryList.length == NumConstant.THREE) {
-                    // 事件大类
-                    dto.setSJDL(categoryList[1]);
-                    //事件小类
-                    dto.setSJXL(categoryList[2]);
-                } else if (categoryList.length == NumConstant.FOUR) {
-                    // 事件大类
-                    dto.setSJDL(categoryList[1]);
-                    //事件小类
-                    dto.setSJXL(categoryList[2]);
-                    //事件细类
-                    dto.setSJXIL(categoryList[3]);
-                }
-
-            }
-
-        }
-    }
-
     /**
      * 处理中流程的当前处理部门
      *
@@ -4120,5 +4068,4 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return baseDao.getItemListByAddress(params);
     }
 
-
 }

From fb5e5808d2983282a8b081c19e0081755326b6f1 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Fri, 21 Oct 2022 10:52:45 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E7=BB=BF=E7=81=AF=E6=95=B0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E3=80=81=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ScreenServiceImpl.java       |  5 +++
 .../main/resources/mapper/item/ItemDao.xml    | 35 +++++++++++--------
 2 files changed, 25 insertions(+), 15 deletions(-)

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 0e0c9649e..878d5b5a3 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,6 +17,7 @@
 
 package com.elink.esua.epdc.modules.screen.service.impl;
 
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.DeptDTO;
@@ -72,6 +73,10 @@ public class ScreenServiceImpl implements ScreenService {
         }
         //2.按条件统计数据
         resultDTO = itemDao.itemDailyStatis(formDTO);
+        int greenTotal = resultDTO.getPendingTotal() + resultDTO.getProcessingTotal() - resultDTO.getRedTotal() - resultDTO.getYellowTotal();
+        if (greenTotal > NumConstant.ZERO) {
+            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 fe74a0858..14f731027 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
@@ -2169,22 +2169,19 @@
             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, now()) > 480 then 1 else 0 end))redTotal,
-            sum(
-                (case when a.item_state = '0'
-                           and getworkminute(a.created_time, now()) > 360
-                           and getworkminute(a.created_time, now())<![CDATA[ <= ]]> 480
-                then 1 else 0 end)
-                )yellowTotal,
-            sum((case when a.item_state = '0' and getworkminute(a.created_time, now())<![CDATA[ <= ]]> 360 then 1 else 0 end))greenTotal
+            sum((case when b.handleId is null and a.item_state='0' and getworkminute(a.created_time, now()) > 480 then 1 else 0 end))redTotal,
+            sum((case when b.handleId is null and a.item_state = '0' and (getworkminute(a.created_time, now()) BETWEEN 360 and 480) then 1 else 0 end))yellowTotal
         FROM
             epdc_item a
         LEFT JOIN (
-            select h.id,h.item_id,h.created_time,h.state
+            select h.id,h.item_id,h.created_time,h.state,p.id as handleId
             <!-- 此处关联主表增加主表查询条件为了提升查询效率 -->
             from epdc_item ei
             inner join epdc_item_handle_process h on ei.id = h.item_id
-            where  ei.is_people = '1'
+            LEFT JOIN (
+                select id,item_id FROM epdc_item_handle_process where handler_dept = '网格化平台' and del_flag = '0' group by item_id
+            ) p ON ei.id = p.item_id
+        where  ei.is_people = '1'
             and ei.del_flag = '0'
             AND ei.event_id is NULL
             AND ei.issue_id is NULL
@@ -2235,8 +2232,11 @@
             epdc_item i
         INNER JOIN (
             SELECT
-                b.id, b.item_id, b.created_time, b.state
+                b.id, b.item_id, b.created_time, b.state, p.id as handleId
             FROM epdc_item_handle_process b
+            LEFT JOIN (
+                select id,item_id FROM epdc_item_handle_process where handler_dept = '网格化平台' and del_flag = '0' group by item_id
+            ) p ON b.item_id = p.item_id
             WHERE b.del_flag = '0'
             AND b.created_time = (
                 SELECT max(created_time)
@@ -2299,15 +2299,20 @@
         </if>
         <choose>
             <when test='lamp != null and lamp == "red"'>
-                and i.item_state='0' and getworkminute(i.created_time, now()) > 480
+                and process.handleId is null and i.item_state='0' and getworkminute(i.created_time, now()) > 480
             </when>
             <when test='lamp != null and lamp == "yellow"'>
+                and process.handleId is null
                 and i.item_state='0'
-                and getworkminute(i.created_time, now()) > 360
-                and getworkminute(i.created_time, now()) <![CDATA[ <= ]]> 480
+                and (getworkminute(i.created_time, now()) BETWEEN 360 and 480 )
             </when>
             <when test='lamp != null and lamp == "green"'>
-                and i.item_state='0' and getworkminute(i.created_time, now()) <![CDATA[ <= ]]> 360
+                <!-- 绿灯指的是未结案的数据中上报到网格化的或者是没有上报到网格化但是时间没有超过六小时的 -->
+                and i.item_state='0'
+                and (
+                    process.handleId is not null
+                    or getworkminute(i.created_time, now()) <![CDATA[ <= ]]> 360
+                )
             </when>
             <otherwise></otherwise>
         </choose>

From 600166bad40a7cff76749f22c218722db01dae24 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 21 Oct 2022 11:17:04 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=9F=8E=E5=B8=82=E7=BB=BC=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java   | 3 ++-
 1 file changed, 2 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 745070a43..b84f3a4d1 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
@@ -3968,7 +3968,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             Integer elseValue = 0;
             for(CategoryAnalysisPieResultDTO dto : list){
                 if(cityCompre.contains(dto.getName())){
-                    dto.setName(dto.getName().replace("城市综合-",""));
+                    String newName = dto.getName();
+                    dto.setName(newName.replace("城市综合-",""));
                     resultList.add(dto);
                 }else{
                     elseValue += Integer.parseInt(dto.getValue());

From 8fe91dfb33c1b84e96f7a448e7e6efc584510c76 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 21 Oct 2022 16:21:44 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E7=BB=99=E5=B8=82=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item/controller/ItemController.java       | 42 +++++++++++++++++++
 .../modules/item/service/ItemService.java     | 31 ++++++++++++++
 .../item/service/impl/ItemServiceImpl.java    | 14 +++++++
 3 files changed, 87 insertions(+)

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 9783f06a3..9ae52e413 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
@@ -454,5 +454,47 @@ public class ItemController {
         return new Result<List<ItemListByAddressResultDTO>>().ok(itemService.getItemListByAddress(params));
     }
 
+    /**
+     * 接受市平台诉求督办
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/10/21 16:13
+     */
+    @PostMapping("gov/case/supervise")
+    public Result supervise(@RequestBody AppealSuperviseResultDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return itemService.supervise(formDto);
+    }
+
+    /**
+     * 接受市平台吹哨驳回
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/10/21 16:13
+     */
+    @PostMapping("gov/case/whistle/reportreject")
+    public Result reportReject(@RequestBody AppealWhistleReportRejectResultDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return itemService.reportReject(formDto);
+    }
+
+    /**
+     * 接受市平台吹哨反馈
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/10/21 16:13
+     */
+    @PostMapping("gov/case/whistle/feedback")
+    public Result feedback(@RequestBody AppealWhistleFeedbackResultDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return itemService.feedback(formDto);
+    }
+
 }
 
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 fb43366b7..b7b3c1a86 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
@@ -662,4 +662,35 @@ public interface ItemService extends BaseService<ItemEntity> {
     Result pushItemDifficulty(AcceptItemDifficultyOutFormDTO formDto);
 
     List<ItemListByAddressResultDTO> getItemListByAddress(Map<String, Object> params);
+
+    /**
+     * 接受市平台诉求督办
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/10/21 16:16
+     */
+    Result supervise(AppealSuperviseResultDTO formDto);
+
+    /**
+     * 接受市平台吹哨驳回
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/10/21 16:16
+     */
+    Result reportReject(AppealWhistleReportRejectResultDTO formDto);
+
+    /**
+     * 接受市平台吹哨反馈
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/10/21 16:16
+     */
+    Result feedback(AppealWhistleFeedbackResultDTO formDto);
+
 }
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 0e306eeb2..82f82bb5b 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
@@ -4069,4 +4069,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return baseDao.getItemListByAddress(params);
     }
 
+    @Override
+    public Result supervise(AppealSuperviseResultDTO formDto){
+        return new Result();
+    }
+
+    @Override
+    public Result reportReject(AppealWhistleReportRejectResultDTO formDto){
+        return new Result();
+    }
+
+    @Override
+    public Result feedback(AppealWhistleFeedbackResultDTO formDto){
+        return new Result();
+    }
 }

From 30e211418253c5dbb2831fb9473a15a18b1b195d Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 21 Oct 2022 16:43:26 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=9D=E9=AA=8C=E7=BB=88=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java    | 5 +++++
 .../src/main/resources/mapper/item/ItemDao.xml               | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java
index 9f1597338..222ea4127 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java
@@ -24,6 +24,11 @@ public enum ItemHandleCategoryEnum {
     HANDLE_CLOSING_CASE(10, "结案"),
     HANDLE_CLOSING_CASE_APPLY(11, "结案申请"), // 之前的结案 2022.9.4需求变更
     HANDLE_I_HANDLE_GRID_TOP(1001, "响应拟办"), // 等同于网格回应   2022.9.4项目发布时使用
+
+    HANDLE_I_HANDLE_CHECK_APPLY(1002, "终验申请"), // 终验申请
+    HANDLE_I_HANDLE_CHECK_AGREE(1003, "终验同意"), // 终验同意
+    HANDLE_I_HANDLE_CHECK_UN_AGREE(1004, "终验不同意"), // 终验不同意
+
     HANDLE_REPORT(15, "社区吹哨");// 之前的上报网格化平台 2022.9.4需求变更
 
     private int value;
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 46ffea0e4..edb12b9be 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
@@ -578,6 +578,9 @@
             and (process.state is not null and process.state not in (11,14,15))
             and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_FLAG = '0'))
         </if>
+        <if test="itemState != null and itemState != '' and itemState == '0'">
+            and (item.EVALUATION_SCORE is null or item.EVALUATION_SCORE = '')
+        </if>
 
         <if test="typeKey != null and typeKey != '' and typeKey == 'grid_party'">
             and (process.state != 0 or process.state is null)