Merge remote-tracking branch 'origin/feature/shenyan_shangbao' into feature/shenyan_shangbao

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java

@@ -33,7 +33,9 @@ public enum ItemHandleCategoryEnum {
     HANDLE_I_HANDLE_CHECK_AGREE(1003, "终验同意"), // 终验同意
     HANDLE_I_HANDLE_CHECK_UN_AGREE(1004, "终验不同意"), // 终验不同意
     HANDLE_I_HANDLE_DISAGREE(1005, "初验不同意"), // 初验不同意
-    HANDLE_REPORT(15, "社区吹哨");// 之前的上报网格化平台 2022.9.4需求变更
+    HANDLE_REPORT(15, "社区吹哨"),// 之前的上报网格化平台 2022.9.4需求变更
+    HANDLE_STREET_REPORT(17, "街道吹哨");
+
 
     private int value;
     private String name;

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

@@ -4401,7 +4401,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         //诉求评价
         pushToCityGridService.evaluation(itemId);
         //2.判断是发展、执法诉求的(这两个诉求项目必须走诉求初验终验逻辑)或者是评价了不满意的民生诉求的需要走市里的初验申请
-        if (!"0".equals(entity.getPeopleFlag()) || (null != entity.getEvaluationScore() && entity.getEvaluationScore() == 0)) {
+        QueryWrapper<ItemCommentFeedbackEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("item_id", itemId);
+        wrapper.eq("del_flag", "0");
+        List<ItemCommentFeedbackEntity> feedbackEntityList = itemCommentFeedbackDao.selectList(wrapper);
+        ItemHandleProcessDTO processDTO = new ItemHandleProcessDTO();
+        if (CollUtil.isEmpty(feedbackEntityList) && (!"0".equals(entity.getPeopleFlag()) || (null != entity.getEvaluationScore() && entity.getEvaluationScore() == 0))) {
             //logger.info("当前诉求不做结案处理，原因：诉求分类PeopleFlag->" + entity.getPeopleFlag() + ",诉求状态itemState->" + entity.getItemState());
             ItemHandleProcessEntity processEntity = new ItemHandleProcessEntity();
             processEntity.setId(UUID.randomUUID().toString().replaceAll("-", ""));
@@ -4418,13 +4423,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
 
         //3.判断评价结果，未评价的赋值为满意并且结案给市平台推送；已评价的结果为满意直接结案给市平台推送
-        QueryWrapper<ItemCommentFeedbackEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("item_id", itemId);
-        wrapper.eq("del_flag", "0");
-        List<ItemCommentFeedbackEntity> feedbackEntityList = itemCommentFeedbackDao.selectList(wrapper);
-        ItemHandleProcessDTO processDTO = new ItemHandleProcessDTO();
-        if ("0".equals(entity.getPeopleFlag()) &&
-                (null == entity.getEvaluationScore() || 0 != entity.getEvaluationScore() || CollUtil.isNotEmpty(feedbackEntityList))) {
+        //有过反馈的或者是民生诉求没有苹果或者评论满意的直接结案
+        if (CollUtil.isNotEmpty(feedbackEntityList) ||
+                ("0".equals(entity.getPeopleFlag()) && (null == entity.getEvaluationScore() || 0 != entity.getEvaluationScore()))) {
             QueryWrapper<ItemHandleProcessEntity> hWrapper = new QueryWrapper<>();
             hWrapper.eq("item_id", itemId);
             hWrapper.eq("state", ItemGridPlatformHandleStatusEnum.HANDLE_XFPJ.getValue());
@@ -4656,7 +4657,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             // 当前操作人部门tyeKey
             String sendTypeKey = "";
             log.info("处理项目-上报网格化平台（社区吹哨）");
-            handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_REPORT.getValue());
+            handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_STREET_REPORT.getValue());
             //informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT);
             // 记录处理记录
             itemHandleProcessService.insert(handleProcessEntity);