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

@@ -1623,7 +1623,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null);
                 pushToCityGridService.appealHandling(ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class));
                 // 诉求审核，上报市平台
-                pushToCityGridService.appealAudit(handleProcessEntity.getId());
+                ItemHandleProcessDTO d = ConvertUtils.sourceToTarget(handleProcessEntity, ItemHandleProcessDTO.class);
+                new DataReport().myRun(d, "2");
+                //pushToCityGridService.appealAudit(handleProcessEntity.getId());
                 log.info("处理项目-结案申请-if结束");
             } else {
                 handleProcessEntity.setState(dto.getHandleCategory());
@@ -2920,7 +2922,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if (ItemGridPlatformHandleStatusEnum.HANDLE_PQ.getValue() == dto.getState()) {
             pushToCityGridService.appealDispatch(dto);//2.2 诉求派遣
             //pushToCityGridService.dispatchAudit(dto);//2.4  派遣审核
-            new DataReport().myRun(dto, "2");
+            new DataReport().myRun(dto, "1");
         } else if (ItemGridPlatformHandleStatusEnum.HANDLE_CZ.getValue() == dto.getState()) {
             if ("区中心".equals(dto.getGridNextpartname())) {
                 // 诉求上报
@@ -2928,7 +2930,7 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             } else {
                 pushToCityGridService.appealDispatch(dto);//2.2 诉求派遣
                 //pushToCityGridService.dispatchAudit(dto);//2.4  派遣审核
-                new DataReport().myRun(dto, "2");
+                new DataReport().myRun(dto, "1");
             }
         } else if (ItemGridPlatformHandleStatusEnum.HANDLE_TD.getValue() == dto.getState()) {
             pushToCityGridService.rebut(dto);//2.8 诉求退件