初审终审列表修改

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;
     /**
      * 项目状态

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<ItemDao, ItemEntity> implem
         IPage<ItemPendingHandleDTO> page = getPage(params);
         List<ItemPendingHandleDTO> list = baseDao.firstCheckPage(params);
         Map<String, Long> 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<ItemDao, ItemEntity> implem
         IPage<ItemPendingHandleDTO> page = getPage(params);
         List<ItemPendingHandleDTO> list = baseDao.endCheckPage(params);
         Map<String, Long> 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());
     }
 

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