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] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=89=E4=B8=AA=E4=B8=8D=E6=BB=A1=E6=84=8F=E5=88=97?=
 =?UTF-8?q?=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"/>