From 3a0855b3158b04c70b97616a0463aa0828ff6b24 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 26 Oct 2022 17:03:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B8=E5=9E=8B=E6=A1=88=E4=BE=8Bh?=
 =?UTF-8?q?=E5=92=8C=E5=90=B9=E5=93=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/dto/item/result/ItemAppealPageResultDTO.java  | 10 ++++++++++
 .../epdc/modules/item/controller/ItemController.java   |  2 +-
 .../esua/epdc/modules/item/entity/ItemEntity.java      |  5 +++++
 .../esua/epdc/modules/item/service/ItemService.java    |  2 +-
 .../src/main/resources/mapper/item/ItemDao.xml         |  5 +++--
 5 files changed, 20 insertions(+), 4 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 fbcb6f75f..eb7d1f5c8 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
@@ -134,4 +134,14 @@ public class ItemAppealPageResultDTO implements Serializable {
      */
     private String processState;
 
+    /**
+     * 是否是难点堵点：0否1是
+     */
+    private String isDifficulty;
+
+    /**
+     * 是否典型案例：0否1是
+     */
+    private String isTypical;
+
 }
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 910a84fdf..6a6b067d6 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
@@ -111,7 +111,7 @@ public class ItemController {
     }
 
     /**
-     * 在党群E家流转中，尚未报到区平台的项目列表
+     * 在党群E家流转中，尚未报到区平台的项目列表（难点堵点）
      *
      * @param params
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.item.ItemPendingHandleDTO>>
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 6c6415baa..4693d05ac 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
@@ -278,4 +278,9 @@ public class ItemEntity extends BaseEpdcEntity {
      * 是否市平台督办：0否1是
      */
     private String isWhistle;
+
+    /**
+     * 是否典型案例：0否1是
+     */
+    private String isTypical;
 }
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 75b907126..ae17dedb8 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
@@ -68,7 +68,7 @@ public interface ItemService extends BaseService<ItemEntity> {
     PageData<ItemPendingHandleDTO> listOfItemsForPCEnd(Map<String, Object> params);
 
     /**
-     * 在党群E家流转中，尚未报到区平台的项目列表
+     * 在党群E家流转中，尚未报到区平台的项目列表（难点堵点）
      *
      * @param params
      * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.item.ItemPendingHandleDTO>
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 bfd72d465..c0a05245e 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
@@ -714,6 +714,7 @@
         WHERE item.DEL_FLAG = '0'
         and (process.state is not null and process.state not in (11,15))
         and item.IS_PEOPLE = '1'
+        and item.IS_DIFFICULTY = '1'
         <if test="typeKey != null and typeKey != '' and typeKey == 'grid_party'">
             and (process.state != 0 or process.state is null)
         </if>
@@ -779,8 +780,6 @@
         item.CREATED_TIME DESC
     </select>
 
-
-
     <select id="firstCheckPage" resultType="com.elink.esua.epdc.dto.item.ItemPendingHandleDTO">
         SELECT
         item.ID,
@@ -2150,6 +2149,8 @@
                     else ''
                     end as evaluationScoreName,
                 process.state AS processState,
+                i.IS_DIFFICULTY,
+                i.IS_TYPICAL,
                 i.EVALUATION_CONTENT,
                 i.EVALUATION_TIME
         FROM epdc_item i

From 1ec8ac4d949283e8157357ab990c3351aa8b4664 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 26 Oct 2022 17:12:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/screen/ScreenDeptEventStatDao.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4ba6132ab..635221108 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
@@ -319,6 +319,6 @@
         AND a.type_key != 'street_dept'
         AND a.type_key != 'district_dept'
         GROUP BY a.id
-        ORDER BY a.sort
+        ORDER BY a.sort, CONVERT(a.`name` USING gbk) ASC
     </select>
 </mapper>
\ No newline at end of file