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

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

@@ -4355,6 +4355,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if ("10".equals(entity.getItemState())) {
             return;
         }
+        //走到这程序不管往下是去结案还是推初验申请都要先推评价
+        //诉求评价
+        pushToCityGridService.evaluation(itemId);
         //2.判断是发展、执法诉求的(这两个诉求项目必须走诉求初验终验逻辑)或者是评价了不满意的民生诉求的需要走市里的初验申请
         if (!"0".equals(entity.getPeopleFlag()) || (null != entity.getEvaluationScore() && entity.getEvaluationScore() == 0)) {
             //logger.info("当前诉求不做结案处理，原因：诉求分类PeopleFlag->" + entity.getPeopleFlag() + ",诉求状态itemState->" + entity.getItemState());
@@ -4409,12 +4412,6 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             dto.setCreatedTime(hEntity.getCreatedTime());
             processDTO = closedItem(dto);
         }
-
-        //4.市平台推送数据
-        //4-1.诉求评价
-        pushToCityGridService.evaluation(itemId);
-        //4-2.诉求结案
-        pushToCityGridService.caseClosedSentoCity(processDTO.getId());
     }
 
     /**
@@ -4462,7 +4459,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             // 手动拼接流转协助部门
             ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO();
             itemCirculationDeptResultDTO.setDeptId(dept.getData().getPid());
-            itemCirculationDeptResultDTO.setDeptName(dept.getData().getParentName());
+            itemCirculationDeptResultDTO.setDeptName("市北区委");
             itemCirculationDeptResultDTO.setSelected(false);
             itemCirculationDeptResultDTO.setTypeKey(dept.getData().getTypeKey());
             List<ItemCirculationDeptResultDTO> deptList = new ArrayList<>();
@@ -4772,6 +4769,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         message = message + ":" + formDto;
         this.saveInterfaceLog(formDto.getItemId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(),
                 ApiConstants.acceptItemProcess, successFlag, message, returnMsgBody);
+        //诉求结案
+        pushToCityGridService.caseClosedSentoCity(itemHandleProcessDto.getId());
         return itemHandleProcessDto;
     }
 

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

@@ -1028,7 +1028,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
                     dto.setCzjg("01");
                     break;
                 default:
-                    dto.setCzjg("");
+                    dto.setCzjg("01");
                     break;
             }
             //评价时间