From adb58a8c20568dba8f1b29c07e188bbbb128ca9a Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Mon, 21 Aug 2023 15:16:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E7=BA=A7=E5=8A=9E=E7=90=86=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/enums/ItemHandleCategoryEnum.java    |  3 +++
 .../item/service/impl/ItemServiceImpl.java    | 20 +++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java
index 2bb1d74f1..236a1a8c7 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java
@@ -34,6 +34,9 @@ public enum ItemHandleCategoryEnum {
     HANDLE_I_HANDLE_CHECK_UN_AGREE(1004, "终验不同意"), // 终验不同意
     HANDLE_I_HANDLE_DISAGREE(1005, "初验不同意"), // 初验不同意
     HANDLE_I_REPORT_CITY(3000, "市里驳回重新上报"), // 初验不同意
+
+    HANDLE_I_REPORT_CITY_AGAIN(3001, "市里驳回再次重新上报"), // 市里驳回再次重新上报
+
     HANDLE_REPORT(15, "社区吹哨"),// 之前的上报网格化平台 2022.9.4需求变更
     HANDLE_STREET_REPORT(17, "街道吹哨");
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 70f09cd14..8cef0e664 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -4137,6 +4137,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
      */
     public Result sendReportWGH(ItemHandleSubmitFormDTO dto) {
         ItemGridPlatformEntity gridEntity = this.getReport(dto.getId());
+
+        // 项目处理流程表信息组装
+        ItemEntity itemEntity = baseDao.selectById(dto.getId());
+        ItemHandleProcessEntity itemHandleProcessEntity = new ItemHandleProcessEntity();
+        itemHandleProcessEntity.setItemId(itemEntity.getId());
+        itemHandleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_REPORT_CITY_AGAIN.getValue());
+        itemHandleProcessEntity.setHandleAdvice("市级办理再次上报");
+        itemHandleProcessEntity.setOutHandleAdvice("市级办理再次上报");
+        itemHandleProcessEntity.setHandlerDeptId(itemEntity.getGridId());
+        itemHandleProcessEntity.setHandlerDept(itemEntity.getGrid());
+        itemHandleProcessService.insert(itemHandleProcessEntity);
+
         if (null != gridEntity) {
             //驳回重办
             EventRejectDoResultDto reDoResult = new EventRejectDoResultDto();
@@ -4150,24 +4162,24 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 throw new RenException("上报驳回重办失败：" + reDoResult.getMessage());
             }
             //记录平台上报信息
-//            this.saveItemRejectReDoInfo(gridEntity, process);
+            this.saveItemRejectReDoInfo(gridEntity, itemHandleProcessEntity);
         } else {
             //事件第一次上报
             SendEventResultDto sendResult = new SendEventResultDto();
             try {
                 sendResult = this.reportCaseNew(dto);
             } catch (Exception e) {
-//                itemHandleProcessDao.deleteById(process.getId());
+                itemHandleProcessDao.deleteById(itemHandleProcessEntity.getId());
                 log.error("上报网格化平台接口失败：" + e.getMessage());
                 throw new RenException("上报网格化平台接口失败：" + sendResult.getMessage());
             }
             if (!"0".equals(sendResult.getCode())) {
-//                itemHandleProcessDao.deleteById(process.getId());
+                itemHandleProcessDao.deleteById(itemHandleProcessEntity.getId());
                 // 接口没有返回信息，也没有异常信息
                 throw new RenException("上报网格化平台接口失败：" + sendResult.getMessage());
             }
             // 记录平台上报信息
-//            this.saveItemGridPlatformInfo(sendResult, process);
+            this.saveItemGridPlatformInfo(sendResult, itemHandleProcessEntity);
         }
         //上报完成后拽一下网格化平台的流程旨在解决大屏红灯事件处理了没有立刻变为绿灯问题
 //        new PullProcess().myRun(dto.getId());