追加废弃

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

@@ -43,12 +43,12 @@ public interface PushToCityGridService {
     /**
      * 诉求废弃
      *
-     * @param
+     * @param dto
      * @return void
      * @author zhy
      * @date 2022/9/16 15:17
      */
-    void appealScrap();
+    void appealScrap(ItemHandleProcessDTO dto);
 
     /**
      * 诉求督办

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

@@ -2429,6 +2429,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             pushToCityGridService.earlyInspection(dto);
             //诉求终验
             pushToCityGridService.endInspection(dto);
+        } else if(ItemGridPlatformHandleStatusEnum.HANDLE_ZF.getValue() == dto.getState()){
+            //诉求初验
+            pushToCityGridService.appealScrap(dto);
         }
         // 网格化平台，处置完成、延期申请、申请办结、向上申请
         if (ItemGridPlatformHandleStatusEnum.HANDLE_CL.getValue() == dto.getState() ||

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

@@ -133,7 +133,31 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
 
     @Override
-    public void appealScrap() {
+    public void appealScrap(ItemHandleProcessDTO processDTO) {
+        if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) {
+            ItemHandleProcessEntity item = itemHandleProcessDao.selectById(processDTO.getId());
+            String sqId = getSqid(item.getItemId());
+            if (StringUtils.isNotBlank(sqId)) {
+                AppealScrapResultDTO dto = new AppealScrapResultDTO();
+
+                dto.setSqid(getSqid(item.getItemId()));
+                dto.setSqzt(CityPushStateEnum.FQ.getCode());
+                dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
+                dto.setCzsj(item.getCreatedTime().toString());
+                dto.setCznr(item.getHandleAdvice());
+                AppealScrapResultDTO.CzrDTO czr = new AppealScrapResultDTO.CzrDTO();
+                czr.setId(item.getGridPartyid());
+                czr.setXm(item.getGridPartyname());
+                czr.setSsjgbm(item.getGridUnitid());
+                czr.setSsjg(item.getGridUnitname());
+                czr.setSsbmbm(item.getGridUnitid());
+                czr.setSsbm(item.getGridUnitname());
+                dto.setCzr(czr);
+                // 组装好直接推送
+                String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SCRAP, "诉求废弃");
+                saveLog(item.getItemId(), item.getId(), "诉求结案", PushToCityGridConstant.CASE_CLOSED, JSONObject.toJSONString(dto), result);
+            }
+        } else {
             // 昨天
             String date = DateUtils.format(DateUtils.addDateDays(new Date(), -1));
             // state=作废的流程数据
@@ -158,7 +182,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
                 // 组装好直接推送
                 cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SCRAP, "诉求废弃");
             });
-
+        }
     }
 
 
@@ -595,8 +619,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
     }
 
 
-
-
     /**
      * 获取诉求编码，接口2-21可用
      *
@@ -611,6 +633,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
     /**
      * 2.8 诉求退件
+     *
      * @author sun
      */
     @Override
@@ -652,6 +675,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
     /**
      * 2.9 退件审核
+     *
      * @author sun
      */
     @Override
@@ -695,6 +719,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
     /**
      * 2.10 延期申请
+     *
      * @author sun
      */
     @Override
@@ -738,6 +763,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
     /**
      * 2.11 延期审核
+     *
      * @author sun
      */
     @Override