From 49ae21507fc1b7eb188fa629a58c1e5a3addef8f Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Wed, 14 Jun 2023 15:47:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=83=85=E5=86=B5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/modules/item/dao/ItemDao.java   |  2 +
 .../item/service/impl/ItemServiceImpl.java    |  5 ++-
 .../main/resources/mapper/item/ItemDao.xml    | 44 +++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

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 198cbec31..f6b1d0f0e 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
@@ -548,4 +548,6 @@ public interface ItemDao extends BaseDao<ItemEntity> {
     List<ItemListByAddressResultDTO> getItemListByAddress(Map<String, Object> params);
 
     List<ItemStatisListPageResultDTO> getevaluationList(Map<String, Object> params);
+
+    List<ItemStatisListPageResultDTO> getsolutionList(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 d95592fdd..69e07e70b 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
@@ -4556,7 +4556,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         List<ItemStatisListPageResultDTO> list = new ArrayList<>();
         if (!params.isEmpty() && params.containsKey("evaluationScore") && null != params.get("evaluationScore")) {
             list = baseDao.getevaluationList(params);
-        } else {
+        } else if (!params.isEmpty() && params.containsKey("solutionInfo") && null != params.get("solutionInfo")) {
+            list = baseDao.getsolutionList(params);
+        }
+        else {
             list = baseDao.getItemStatisListPage(params);
         }
 
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 d131fed30..0c8d13d23 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
@@ -3129,6 +3129,50 @@
             and item.EVALUATION_SCORE is not null
         order by item.created_time DESC
     </select>
+
+
+    <select id="getsolutionList" resultType="com.elink.esua.epdc.dto.item.result.ItemStatisListPageResultDTO">
+        SELECT
+        item.id,
+        item.item_content,
+        item.item_state,
+        item.nick_name,
+        item.mobile,
+        item.created_time,
+        item.serial_num,
+        item.grid AS gridName,
+        SUBSTRING_INDEX(REPLACE (item.parent_dept_names, '市北区委-', ''), '-', 1) AS streetName,
+        SUBSTRING_INDEX(REPLACE (item.parent_dept_names, '市北区委-', ''), '-' ,- 1) AS communityName,
+        item.people_flag
+        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) != '其他' and item.PEOPLE_FLAG = '0') or (item.PEOPLE_FLAG in ('1','2')))
+        <choose>
+            <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+            </when>
+            <otherwise>
+                AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) <![CDATA[ <= ]]> DATE_FORMAT(date_sub(now(),interval 1 day),'%Y-%m-%d')
+            </otherwise>
+        </choose>
+        <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>
+        <if test="solutionInfo != null and solutionInfo != ''">
+            AND item.SOLUTION_INFO = #{solutionInfo}
+        </if>
+        and item.SOLUTION_INFO is not null
+        order by item.created_time DESC
+    </select>
+
     <select id="resolveTotal" resultType="com.elink.esua.epdc.dto.item.result.ResolveTotalPieResultDTO">
 
         select