From b6555eb668cbd5b8d638e50dfecf3eaa6a250bf8 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 23 Nov 2022 14:10:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=AE=A1=E7=BB=88=E5=AE=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/item/ItemPendingHandleDTO.java | 2 ++ .../item/service/impl/ItemServiceImpl.java | 24 +++++++++++++++++-- .../main/resources/mapper/item/ItemDao.xml | 2 ++ 3 files changed, 26 insertions(+), 2 deletions(-) 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 d4d0d6080..5888b21c4 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 @@ -7,6 +7,7 @@ import java.util.Date; /** * 项目处理列表DTO + * * @Author LC * @Date 2019/9/12 17:42 */ @@ -115,6 +116,7 @@ public class ItemPendingHandleDTO implements Serializable { /** * 诉求类型 */ + private String peopleFlag; private String peopleFlagName; /** * 项目状态 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 5a2eef4dd..0105d3bde 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 @@ -329,7 +329,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem IPage page = getPage(params); List list = baseDao.firstCheckPage(params); Map map = listItemHandleDept(); - list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId()))); + list.forEach(item -> { + item.setItemHandleDeptId(map.get(item.getId())); + if (!NumConstant.ZERO_STR.equals(item.getPeopleFlag())) { + item.setStreetName(item.getGridName()); + item.setCommunityName(""); + item.setGridName(""); + item.setPeopleFlagName(NumConstant.ONE_STR.equals(item.getPeopleFlag()) ? "发展诉求" : "执法诉求"); + } else { + item.setPeopleFlagName("民生诉求"); + } + }); return new PageData<>(list, page.getTotal()); } @@ -373,7 +383,17 @@ public class ItemServiceImpl extends BaseServiceImpl implem IPage page = getPage(params); List list = baseDao.endCheckPage(params); Map map = listItemHandleDept(); - list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId()))); + list.forEach(item -> { + item.setItemHandleDeptId(map.get(item.getId())); + if (!NumConstant.ZERO_STR.equals(item.getPeopleFlag())) { + item.setStreetName(item.getGridName()); + item.setCommunityName(""); + item.setGridName(""); + item.setPeopleFlagName(NumConstant.ONE_STR.equals(item.getPeopleFlag()) ? "发展诉求" : "执法诉求"); + } else { + item.setPeopleFlagName("民生诉求"); + } + }); 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 4fa04433b..dd74f62c4 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 @@ -790,6 +790,7 @@ item.MOBILE, item.ITEM_STATE, item.grid AS gridName, + item.PEOPLE_FLAG, SUBSTRING_INDEX(REPLACE (item.parent_dept_names, '市北区委-', ''), '-', 1) AS streetName, SUBSTRING_INDEX(REPLACE (item.parent_dept_names, '市北区委-', ''), '-' ,- 1) AS communityName, CASE item.EVALUATION_SCORE @@ -894,6 +895,7 @@ item.MOBILE, item.ITEM_STATE, item.grid AS gridName, + item.PEOPLE_FLAG, SUBSTRING_INDEX(REPLACE (item.parent_dept_names, '市北区委-', ''), '-', 1) AS streetName, SUBSTRING_INDEX(REPLACE (item.parent_dept_names, '市北区委-', ''), '-' ,- 1) AS communityName, CASE item.EVALUATION_SCORE