在处置、向上申请增加推送逻辑

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

@@ -162,6 +162,11 @@ public interface PushToCityGridService {
      * @author sun
      */
     void delayAudit(ItemHandleProcessDTO dto);
+    /**
+     * 再处置、向上申请时判断上个节点是退回则(2.9 退件审核)结果为通过
+     * @author sun
+     */
+    void again(ItemHandleProcessDTO dto);
 
     /**
      * 2.12 诉求评价

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

@@ -2421,7 +2421,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             pushToCityGridService.delayApply(dto);//2.10 延期申请
         } else if (ItemGridPlatformHandleStatusEnum.HANDLE_YQSH.getValue() == dto.getState()) {
             pushToCityGridService.delayAudit(dto);//2.11 延期审核
-        } else if(ItemGridPlatformHandleStatusEnum.HANDLE_DB.getValue() == dto.getState()){
+        } else if (ItemGridPlatformHandleStatusEnum.HANDLE_ZCZ.getValue() == dto.getState() || ItemGridPlatformHandleStatusEnum.HANDLE_XSSQ.getValue() == dto.getState()) {
+            pushToCityGridService.again(dto);//再处置、向上申请时判断上个节点是退回则(2.9 退件审核)结果为通过
+        }  else if(ItemGridPlatformHandleStatusEnum.HANDLE_DB.getValue() == dto.getState()){
             //诉求督办
             pushToCityGridService.appealSupervise(dto);
         } else if(ItemGridPlatformHandleStatusEnum.HANDLE_XFHC.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

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.item.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.constant.StrConstant;
 import com.elink.esua.epdc.commons.tools.enums.CityPushEnum;
@@ -835,6 +836,47 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
     }
 
+    @Override
+    public void again(ItemHandleProcessDTO formDTO) {
+        //1.判断上一个流程节点是否是退回
+        if (null != formDTO && StringUtils.isNotBlank(formDTO.getItemId())) {
+            QueryWrapper<ItemHandleProcessEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq("item_id", formDTO.getItemId());
+            wrapper.eq("created_by", "网格化平台");
+            wrapper.eq("del_flag", "0");
+            wrapper.orderByDesc("created_time");
+            wrapper.last("limit 1");
+            ItemHandleProcessEntity processEntity = itemHandleProcessDao.selectOne(wrapper);
+            if (null == processEntity || !String.valueOf(ItemGridPlatformHandleStatusEnum.HANDLE_TD.getValue()).equals(processEntity.getState())) {
+                return;
+            }
+            ItemHandleProcessEntity item = itemHandleProcessDao.selectById(formDTO.getId());
+            RebutAuditResultDTO dto = new RebutAuditResultDTO();
+            dto.setSqid(getSqid(item.getItemId()));
+            //dto.setSqzt(CityPushStateEnum.FQ.getCode());
+            dto.setDqclhj(CityPushLinkEnum.TJSH.getCode());
+            dto.setCzsj(item.getCreatedTime());
+            dto.setShjg("1");//审核通过
+            dto.setCznr(item.getHandleAdvice());
+            //操作人
+            RebutAuditResultDTO.CzrDTO czr = new RebutAuditResultDTO.CzrDTO();
+            czr.setId(item.getGridPartyid());
+            czr.setXm(item.getGridPartyname());
+            czr.setSsjgid(item.getGridUnitid());
+            czr.setSsjgmc(item.getGridUnitname());
+            czr.setSsbmid(item.getGridUnitid());
+            czr.setSsbmmc(item.getGridUnitname());
+            dto.setCzr(czr);
+            // 组装好直接推送
+            String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.REBUT_AUDIT, "退件审核");
+            //新增日志记录
+            String str = (formDTO.getState().equals(ItemGridPlatformHandleStatusEnum.HANDLE_ZCZ.getValue()) ? "再处置"
+                    : (formDTO.getState().equals(ItemGridPlatformHandleStatusEnum.HANDLE_XSSQ.getValue()) ? "向上申请" : "退件审核"));
+            saveLog(item.getItemId(), item.getId(), str, PushToCityGridConstant.REBUT_AUDIT, JSONObject.toJSONString(dto), result);
+        }
+
+    }
+
     /**
      * 2.12 诉求评价
      *