From 3b14ac75ff840be6f957757d10f8f89abe6d15ec Mon Sep 17 00:00:00 2001
From: HAHA <1824278510@qq.com>
Date: Mon, 26 Sep 2022 14:35:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E9=A9=B3=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=89=E6=B1=82=E4=B8=8A=E6=8A=A5=E7=9A=84=E8=AF=89=E6=B1=82?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=92=8C=E5=BD=93=E5=89=8D=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=8E=AF=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PushToCityGridServiceImpl.java       | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
index 7be4e8bfb..483775870 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
@@ -446,10 +446,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
         // 诉求id
         data.setSqid(getSqid(item.getItemId()));
-        // 诉求状态（未知）
-        data.setSqzt(CityPushStateEnum.DCL.getCode());
-        // 当前处理环节（未知）
-        data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
+
         // 上报时间
         data.setCzsj(item.getCreatedTime());
         // 上报原因
@@ -457,7 +454,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
         // 操作人
         AppealReportResultDTO.CzrDTO dto = new AppealReportResultDTO.CzrDTO();
-        if(source.equals(NumConstant.ONE_STR)) {
+        if(source.equals(NumConstant.ONE_STR)) { // 0是自己平台
+            // 诉求状态（未知）
+            data.setSqzt(CityPushStateEnum.DCL.getCode());
+            // 当前处理环节（未知）
+            data.setDqclhj(CityPushLinkEnum.ZJYP.getCode());
+
             // 操作人姓名
             dto.setXm(item.getGridPartyname());
             // 操作人员唯一标识
@@ -479,10 +481,15 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
                     dto.setSsjgbm(adminFeignClient.getCompleteDept(item.getHandlerDeptId()).toString());
                 }
             }
-        } else {
+        } else { // 1是网格化
             dto.setXm(item.getCreatedBy());
             dto.setSsbmbm(item.getHandlerDeptId()+"");
             dto.setSsbm(item.getHandlerDept());
+
+            // 诉求状态（未知）
+            data.setSqzt(CityPushStateEnum.DPQ.getCode());
+            // 当前处理环节（未知）
+            data.setDqclhj(CityPushLinkEnum.QZXYP.getCode());
         }
 
         // 组装完成，推送
@@ -517,7 +524,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         // 诉求状态（未知）
         data.setSqzt(CityPushStateEnum.DCL.getCode());
         // 当前处理环节（未知）
-        data.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
+        data.setDqclhj(CityPushLinkEnum.ZJYP.getCode());
         // 驳回时间
         data.setCzsj(item.getCreatedTime());
         // 驳回原因