Merge branch 'feature/hotfix_shangbao' into feature/bssb_screen

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptDTO.java

@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 部门管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Data
+public class DeptDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 上级ID
+     */
+    private Long pid;
+    /**
+     * 所有上级ID，用逗号分开
+     */
+    private String pids;
+    /**
+     * 部门名称
+     */
+    private String name;
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 上级部门名称
+     */
+    private String parentName;
+
+    /**
+     * 部门类型键值
+     */
+    private String typeKey;
+
+    /**
+     * 部门编码
+     */
+    private String partyCode;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 联系方式
+     */
+    private String mobile;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 所属地区码（所属组织地区码）
+     */
+    private String areaCode;
+
+    /**第三方编码
+     */
+    private String infoCode;
+
+    /**
+     * 市中心区划编码
+     */
+    private String disCenterZoningCode;
+}

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -346,7 +346,7 @@ public class SysDeptController {
     }
 
     /**
-     * @param [deptId]
+     * @param deptId
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @describe: 获得部门类型
      * @author wangtong
@@ -513,4 +513,12 @@ public class SysDeptController {
         return new Result<SysDeptDTO>().ok(sysDeptService.getDept(formDTO));
     }
 
+    @GetMapping("option/list")
+    @ApiOperation("下拉列表")
+    public Result<List<DeptDTO>> listOption(@RequestParam Map<String, Object> params) {
+        List<DeptDTO> list = sysDeptService.listDefault(params);
+
+        return new Result<List<DeptDTO>>().ok(list);
+    }
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -34,6 +34,16 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
 
     List<SysDeptDTO> list(Map<String, Object> params);
 
+    /**
+     * 默认列表，无数据权限
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.DeptDTO>
+     * @author zhy
+     * @date 2022/10/11 14:46
+     */
+    List<DeptDTO> listDefault(Map<String, Object> params);
+
     SysDeptDTO get(Long id);
 
     void save(SysDeptDTO dto);

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -129,6 +129,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return TreeUtils.build(dtoList);
     }
 
+    @Override
+    public List<DeptDTO> listDefault(Map<String, Object> params) {
+        List<SysDeptEntity> entityList = baseDao.getList(params);
+
+        return ConvertUtils.sourceToTarget(entityList, DeptDTO.class);
+    }
+
     @Override
     public List<SysSimpleDeptDTO> subList(String pid) {
         QueryWrapper<SysDeptEntity> wrapper = new QueryWrapper<>();

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -12,6 +12,12 @@
                 #{id}
             </foreach>
         </if>
+        <if test="pid != null and pid != ''">
+            AND t1.pid = #{pid}
+        </if>
+        <if test="eventContent != null and eventContent != ''">
+            AND t1.type_key = #{typeKey}
+        </if>
         order by t1.sort asc
     </select>
 

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;
+
     /**
      * 头像
      */

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java

@@ -116,7 +116,8 @@ public class ItemAppealPageResultDTO implements Serializable {
     private String evaluationTime;
 
     /**
-     * 是否提醒社区处理(1:提示)
+     * 是否提醒社区处理(1:红灯，2黄灯，3绿灯)
      */
     private String isRemind;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueServiceImpl.java

@@ -472,10 +472,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         itemEntity.setPeopleFlag("0");//民生诉求
         //民生诉求所属网格对应的所属社区的市中心编码
         Result<CompleteDeptDTO> result = adminFeignClient.getCompleteDept(issueEntity.getGridId());
-        if(!result.success()){
+        if (!result.success()) {
             throw new RenException(result.getMsg());
         }
-        itemEntity.setSerialNum(itemServiceImpl.getSerialNum("MS" + result.getData().getCommunityDisCenterZoningCode()));
+        String code = result.getData().getCommunityDisCenterZoningCode();
+        itemEntity.setSerialNum(itemServiceImpl.getSerialNum("MS" + code));
         return itemEntity;
     }
 

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

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java

@@ -6,8 +6,6 @@ import com.elink.esua.epdc.modules.item.service.PushToCityGridService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.management.relation.RelationSupport;
-
 @RestController
 @RequestMapping("PushToCity")
 public class PushToCityGridController {
@@ -52,7 +50,7 @@ public class PushToCityGridController {
      */
     @PostMapping("AppealReporting")
     public Result AppealReporting(String processId, String source){
-        return pushToCityGridService.AppealReporting(processId, source);
+        return pushToCityGridService.appealReporting(processId, source);
     }
 
     /**
@@ -65,7 +63,7 @@ public class PushToCityGridController {
      */
     @PostMapping("ReportRejection")
     public Result ReportRejection(ItemHandleProcessDTO dto){
-        return pushToCityGridService.ReportRejection(dto.getItemId());
+        return pushToCityGridService.reportRejection(dto.getItemId());
     }
 
     /**
@@ -78,6 +76,6 @@ public class PushToCityGridController {
      */
     @PostMapping("AppealHandling")
     public Result AppealHandling(@RequestBody ItemHandleProcessDTO dto){
-        return pushToCityGridService.AppealHandling(dto);
+        return pushToCityGridService.appealHandling(dto);
     }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -410,6 +410,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: 北尚诉求详情

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java

@@ -153,6 +153,10 @@ public class ItemEntity extends BaseEpdcEntity {
      */
     private Double issueLongitude;
 
+    /**
+     * 满意度评价状态(0-不可评价，1-可评价)
+     */
+    private String evaluationState;
     /**
      * 满意度评价得分
      */

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

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java

@@ -107,7 +107,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 10:22
      */
-    Result AppealReporting(String processId,String source);
+    Result appealReporting(String processId, String source);
 
     /**
      * 事件感知
@@ -127,7 +127,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 10:43
      */
-    Result ReportRejection(String id);
+    Result reportRejection(String id);
 
     /**
      * 诉求处理
@@ -137,7 +137,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 11:01
      */
-    Result AppealHandling(ItemHandleProcessDTO dto);
+    Result appealHandling(ItemHandleProcessDTO dto);
 
     /**
      * 2.8 诉求退件

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemFusingDelayServiceImpl.java

@@ -77,7 +77,7 @@ public class ItemFusingDelayServiceImpl extends BaseServiceImpl<ItemFusingDelayD
     public PageData<ItemHandleListDTO> page(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -228,7 +228,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public PageData<ItemPendingHandleDTO> listOfItemsForPCEnd(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
@@ -273,7 +273,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemPendingHandleDTO> listEqPc(ItemWorkListFormDTO formDTO) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) {
@@ -318,7 +318,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public PageData<ItemPendingHandleDTO> listOfItemsForPCReject(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
@@ -358,7 +358,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemPendingHandleDTO> rejectListEqPc(ItemWorkListFormDTO formDTO) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) {
@@ -488,11 +488,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public Result submitLawItem(ItemLawSubmitDTO formDto) {
         UserDetail userDetail = SecurityUser.getUser();
         if (null == userDetail) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (!(StringUtils.isNotBlank(userDetail.getTypeKey())
                 && OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(userDetail.getTypeKey()))) {
-            throw new RuntimeException("请用街道账号进行上报");
+            throw new RenException("请用街道账号进行上报");
         }
         ItemEntity itemEntity = new ItemEntity();
         /**
@@ -508,6 +508,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemEntity.setDistributeTime(new Date());
         itemEntity.setGrid("执法诉求" + userDetail.getDeptName());
         itemEntity.setGridId(userDetail.getDeptId());
+
         itemEntity.setItemContent(formDto.getLawContent());
         itemEntity.setItemVoice(formDto.getItemVoice());
         itemEntity.setDuration(formDto.getDuration());
@@ -528,8 +529,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if (!dtoResult.success()) {
             throw new RenException(dtoResult.getMsg());
         }
+
+        // 因为是街道账号，所以上级一定是市北区委
+        Long pids = dtoResult.getData().getPid();
+        String pnames = dtoResult.getData().getParentName();
+        itemEntity.setParentDeptIds(pids + "");
+        itemEntity.setParentDeptNames(pnames);
+        itemEntity.setAllDeptIds(pids + "," + userDetail.getDeptId());
+        itemEntity.setAllDeptNames(pnames + "-" + userDetail.getDeptName());
+
         // 流水号
-        itemEntity.setSerialNum(getSerialNum("ZF" + dtoResult.getData().getDisCenterZoningCode()));
+        String code = dtoResult.getData().getDisCenterZoningCode();
+        itemEntity.setSerialNum(getSerialNum("ZF" + code));
         baseDao.insert(itemEntity);
         //插入项目部门关联表
         itemDeptService.savePeopleSubmitInfo(itemEntity);
@@ -1272,12 +1283,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemHandleProgressResultDTO> listOfItemHandleProgressByMobile(String itemId) {
         List<ItemHandleProgressResultDTO> list = baseDao.selectListOfItemHandleProgressByMobile(itemId);
         // 处理多次拼接处理人信息问题
-        for(ItemHandleProgressResultDTO dto : list){
+        for (ItemHandleProgressResultDTO dto : list) {
             String advice = dto.getAdvice();
             // 对包含【h_s】的数据进行重新组装
-            if(advice.contains("h_s")){
+            if (advice.contains("h_s") && advice.contains("   办理人：")) {
-                String hsStr = advice.substring(advice.indexOf("h_s"),advice.length());
+                String hsStr = advice.substring(advice.indexOf("h_s"), advice.length());
-                String adviceOld = advice.substring(0,advice.indexOf("   办理人："));
+                String adviceOld = advice.substring(0, advice.indexOf("   办理人："));
                 String adviceNew = adviceOld + hsStr;
                 dto.setAdvice(adviceNew);
             }
@@ -1378,7 +1389,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 // 发送菜单消息-待处理项目-吹哨部门
                 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null);
                 // 网格吹哨,上报市平台
-                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
+                pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
                 log.info("网格吹哨，上报市平台-结束");
                 // 上报网格化平台（社区吹哨）
             } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) {
@@ -1390,7 +1401,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 log.info("处理项目-上报网格化平台-if结束");
 
                 //社区吹哨，上报市平台
-                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
+                pushToCityGridService.appealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
                 log.info("社区吹哨-上报市平台-结束");
                 // 结案申请
             } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) {
@@ -1451,11 +1462,11 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 longTreeSet.addAll(newDeptIds);
                 List<Long> deptIds = new ArrayList<>(longTreeSet);
 
-                // 网格结案，社区结案，上报市平台
+                // 网格结案申请，社区结案申请，上报市平台
-                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
+//                pushToCityGridService.AppealReporting(handleProcessEntity.getId(), NumConstant.ZERO_STR);
                 // 发送菜单消息-待处理项目-吹哨部门
                 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null);
-                pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
+                pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
                 log.info("处理项目-结案申请-if结束");
             } else {
                 handleProcessEntity.setState(dto.getHandleCategory());
@@ -1904,7 +1915,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         ItemWorkListFormDTO formDTO = new ItemWorkListFormDTO();
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (formDTO.getStreetId() != null && !"".equals(formDTO.getStreetId())) {
@@ -2136,7 +2147,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      */
     private SendEventFormDto packageSendEventEntity(ItemEntity itemEntity, ItemHandleSubmitFormDTO dto) throws Exception {
         SendEventFormDto sendDto = new SendEventFormDto();
-        SendInputInfoFormDto formDto = new SendInputInfoFormDto();
+
         //推送类别（事件上报）
         sendDto.setSENDTYPE(CommonConstants.SEND_TYPE);
         //上报
@@ -2158,7 +2169,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 //事件来源
                 sendDto.setSJLY(CommonConstants.PARTY_EVENT_SOURCE_ZF);
                 //备注
-                sendDto.setBZXX(getItemLawNote(itemEntity.getId()));
+                sendDto.setBZXX(getItemLawNote(itemEntity.getId(), itemEntity.getSerialNum()));
             }
             //执法诉求和发展诉求gridId存的是街道id,需要单独查
             Result<SysDeptDTO> streetResult = adminFeignClient.getSysDeptInfo(itemEntity.getGridId());
@@ -2184,9 +2195,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             }
             //备注
             log.info("上报网格化平台dto：" + dto);
-            sendDto.setBZXX(dto.getHandleAdvice());
+            sendDto.setBZXX(dto.getHandleAdvice()+" 诉求编码：" + itemEntity.getSerialNum());
             if (StringUtils.isNotBlank(dto.getHandleAdviceRemark())) {
-                sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark());
+                sendDto.setBZXX(sendDto.getBZXX() + "\n不予受理详细说明：" + dto.getHandleAdviceRemark() + "\n诉求编码：" + itemEntity.getSerialNum());
             }
             Result<DeptInfoCodeDTO> deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId());
 
@@ -2298,7 +2309,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
         //查询所对应的大类
         CategoryEntity thirdCate = categoryDao.selectById(thirdId);
-        if (null == thirdCate) {
+        if (null == thirdCate || StringUtils.isBlank(thirdCate.getEventCategoryCode())) {
             sendDto.setSJLYU("21");
             sendDto.setSJDL("2199");
             return;
@@ -2337,13 +2348,14 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return result;
     }
 
-    private String getItemLawNote(String itemId) {
+    private String getItemLawNote(String itemId, String serialNum) {
         QueryWrapper<ItemLawEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("item_id", itemId);
         wrapper.eq("del_flag", "0");
         ItemLawEntity itemLaw = itemLawDao.selectOne(wrapper);
         String result = "主办单位：" + itemLaw.getHostUnit() + "\n\n"
-                + "协办单位：" + itemLaw.getAssistUnit();
+                + "协办单位：" + itemLaw.getAssistUnit() + "\n\n"
+                + "诉求编码：" + serialNum;
         return result;
     }
 
@@ -2825,7 +2837,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 ItemGridPlatformHandleStatusEnum.HANDLE_YQSQ.getValue() == dto.getState() ||
                 ItemGridPlatformHandleStatusEnum.HANDLE_SQBJ.getValue() == dto.getState() ||
                 ItemGridPlatformHandleStatusEnum.HANDLE_XSSQ.getValue() == dto.getState()) {
-            pushToCityGridService.AppealReporting(dto.getId(), NumConstant.ONE_STR);
+
+//            pushToCityGridService.appealReporting(dto.getId(), NumConstant.ONE_STR);
+        }
+        // 网格化平台，处置完成
+        if (ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue() == dto.getState()) {
+            pushToCityGridService.appealHandling(dto);
         }
     }
 
@@ -3138,9 +3155,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         } else if (NumConstant.ONE_STR.equals(formDto.getPeopleFlag())) {
             //执法诉求所属街道的市中心编码
             Result<SysDeptDTO> dtoResult = adminFeignClient.getSysDeptInfo(entity.getGridId());
-            if (!dtoResult.success()) {
+            if (dtoResult.success()) {
                 code = dtoResult.getData().getDisCenterZoningCode();
+                // 因为是街道账号，所以上级一定是市北区委
+                Long pids = dtoResult.getData().getPid();
+                String pnames = dtoResult.getData().getParentName();
+                entity.setParentDeptIds(pids + "");
+                entity.setParentDeptNames(pnames);
+                entity.setAllDeptIds(pids + "," + entity.getGridId());
+                entity.setAllDeptNames(pnames + "-" + entity.getGrid());
             }
+
             entity.setSerialNum(getSerialNum("FZ" + code));
         }
         baseDao.insert(entity);
@@ -3348,7 +3373,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemPendingHandleDTO> unExportList(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
@@ -3388,7 +3413,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public List<ItemPendingHandleDTO> rejectUnexport(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
@@ -3464,6 +3489,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);
@@ -3496,7 +3538,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public PageData<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         params.put("deptId", user.getDeptId());
         IPage<ItemExaminePageResultDTO> page = getPage(params);
@@ -3511,7 +3553,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         formDTO.setDeptId(user.getDeptId());
         List<ItemExaminePageResultDTO> list = baseDao.getExaminePageEqPc(formDTO);
@@ -3523,7 +3565,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public Result examineCase(ExamineCaseFormDTO formDto) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
 
         ItemHandleProcessEntity process = new ItemHandleProcessEntity();
@@ -3543,12 +3585,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             throw new RenException("审批标识有误");
         }
         itemHandleProcessDao.insert(process);
-        //同意的时候，上报诉求处理
+//        // 结案申请，同意的时候，上报诉求处理
-        if (NumConstant.ZERO_STR.equals(formDto.getCheckFlag())) {
+//        if (NumConstant.ZERO_STR.equals(formDto.getCheckFlag())) {
-            // 社区审批，上报市平台
+//            // 社区审批，上报市平台
-            pushToCityGridService.AppealReporting(process.getId(), NumConstant.ZERO_STR);
+////            pushToCityGridService.AppealReporting(process.getId(), NumConstant.ZERO_STR);
-            //pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class));
+//            //pushToCityGridService.AppealHandling(ConvertUtils.sourceToTarget(process, ItemHandleProcessDTO.class));
-        }
+//        }
 
         if ("0".equals(formDto.getCheckFlag())) {
             //发送结案申请至街道网格化平台
@@ -3636,7 +3678,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     public String getSerialNum(String prefix) {
         String serialNum = prefix;
         String dateStr = DateUtils.format(new Date(), DateUtils.DATE_TIME);
-        serialNum = serialNum + dateStr + "-";
+        serialNum = serialNum + "-" + dateStr + "-";
 
         String key = RedisKeys.getSerialNumKey(serialNum);
         String numStr;
@@ -3717,6 +3759,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             itemHandleProcessDto.setGridPartyname("结案");
             itemHandleProcessDto.setGridTaskcnname("区中心");
             item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue());
+            // 可以进行评价了
+            item.setEvaluationState(NumConstant.ONE_STR);
             updateById(item);
         } else if ("1".equals(formDto.getState())) {
             itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue());
@@ -3739,7 +3783,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             if ("1".equals(formDto.getState())) {
                 // 上报驳回，上报市平台
                 log.info("上报驳回，上报市平台" + itemHandleProcessDto.getId());
-                pushToCityGridService.ReportRejection(itemHandleProcessDto.getId());
+                pushToCityGridService.reportRejection(itemHandleProcessDto.getId());
             } else if ("0".equals(formDto.getState())) {
                 // 诉求审核，上报市平台
                 pushToCityGridService.appealAudit(itemHandleProcessDto.getId());

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemTimeoutServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
@@ -115,7 +116,7 @@ public class ItemTimeoutServiceImpl extends BaseServiceImpl<ItemTimeoutDao, Item
     public PageData<ItemTimeOutDTO> listOfItemsForPCEnd(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {
@@ -172,7 +173,7 @@ public class ItemTimeoutServiceImpl extends BaseServiceImpl<ItemTimeoutDao, Item
     public List<ItemTimeOutDTO> itemOutExportList(Map<String, Object> params) {
         UserDetail user = SecurityUser.getUser();
         if (null == user) {
-            throw new RuntimeException("获取用户信息失败");
+            throw new RenException("获取用户信息失败");
         }
         if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) {
             if (params.get("streetId") != null && !"".equals(params.get("streetId"))) {

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

@@ -439,7 +439,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 10:22
      */
     @Override
-    public Result AppealReporting(String processId, String source) {
+    public Result appealReporting(String processId, String source) {
         ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getAppealReporting(processId);
         if (null == item) {
             log.error("流程节点不存在");
@@ -528,7 +528,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 10:44
      */
     @Override
-    public Result ReportRejection(String id) {
+    public Result reportRejection(String id) {
         String ids = id;   // ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue();
         ItemHandleProcessToCityResultDTO item = itemHandleProcessDao.getReportRejection(ids);
         if (null == item) {
@@ -587,7 +587,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 11:02
      */
     @Override
-    public Result AppealHandling(ItemHandleProcessDTO processDTO) {
+    public Result appealHandling(ItemHandleProcessDTO processDTO) {
         String id = processDTO.getId();
         AppealHandlingToCityResultDTO item = itemHandleProcessDao.getAppealHandling(id, processDTO.getItemId());
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -1720,6 +1720,102 @@
 
     </select>
     <select id="getItemAppealPage" resultType="com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO">
+        SELECT i.id,
+                i.NICK_NAME,
+                i.CREATED_TIME,
+                case when (getworkminute(i.CREATED_TIME,now())  / 60 > 8) then '1'
+                when (getworkminute(i.CREATED_TIME,now())   / 60 > 6 and getworkminute(i.CREATED_TIME,now()) / 60 &lt;=8) then '2'
+                when (getworkminute(i.CREATED_TIME,now())   / 60 &lt;= 6) then '3' else '' end as isRemind,
+                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
+        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 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>
+
+    <select id="getItemAppealPageUnsatisfactory" resultType="com.elink.esua.epdc.dto.item.result.ItemAppealPageResultDTO">
         SELECT i.id,
         i.NICK_NAME,
         i.CREATED_TIME,
@@ -1767,6 +1863,7 @@
         ) 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}
@@ -1812,6 +1909,7 @@
         </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"/>