From b599b2807ff493f39f239e49a9ca15e16a738c40 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Tue, 25 Oct 2022 20:17:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=BB=A1=E6=84=8F=E5=BA=A6?=
 =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E8=B0=83=E7=94=A8=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8D=95=E7=8B=AC=E5=86=99?=
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    |  8 +++-
 .../main/resources/mapper/item/ItemDao.xml    | 40 +++++++++++++++++++
 3 files changed, 49 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 051fed665..d676a3854 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
@@ -522,4 +522,6 @@ public interface ItemDao extends BaseDao<ItemEntity> {
     void updateBatchBySerialNum(@Param("updateList") List<String> updateList);
 
     List<ItemListByAddressResultDTO> getItemListByAddress(Map<String, Object> params);
+
+    List<ItemStatisListPageResultDTO> getevaluationList(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 ccfd7ae0a..c30237e83 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
@@ -4097,7 +4097,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
             params.put("statDate", df.format(d));
         }
-        List<ItemStatisListPageResultDTO> list = baseDao.getItemStatisListPage(params);
+        List<ItemStatisListPageResultDTO> list = new ArrayList<>();
+        if(!params.isEmpty() && params.containsKey("evaluationScore") && null != params.get("evaluationScore")){
+            list = baseDao.getevaluationList(params);
+        }else {
+            list = baseDao.getItemStatisListPage(params);
+        }
+
         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 4b3ce3cbd..26fa60926 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
@@ -2881,6 +2881,46 @@
             a.all_dept_ids ASC
     </select>
 
+    <select id="getevaluationList" 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) != '其他'
+            <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>
+            and item.EVALUATION_SCORE is not null
+        group by item.EVALUATION_SCORE
+        ORDER BY count(item.ID) desc
+    </select>
+
     <update id="updateBatchBySerialNum">
         UPDATE
         epdc_item