From edf09f3f5486a380ce0e15b1782e9f7a313717aa Mon Sep 17 00:00:00 2001
From: HAHA <1824278510@qq.com>
Date: Wed, 28 Sep 2022 09:53:59 +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=E7=BB=93=E6=A1=88=E6=8E=A5=E5=8F=A3=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=94=BE=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PushToCityGridServiceImpl.java       | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 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 c810b1567..830b629b2 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
@@ -231,23 +231,17 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         // 操作人
         PushToCityGridCaseClosedDTO.CzrDTO czr = new PushToCityGridCaseClosedDTO.CzrDTO();
         // 操作人员名称
-//        czr.setXm(item.getGridPartyname());
-        czr.setXm("HAHA");
+        czr.setXm(item.getGridPartyname());
         // 操作人员唯一标识
-//        czr.setId(item.getGridPartyid());
-        czr.setId("1572475746788093953");
+        czr.setId(item.getGridPartyid());
         // 所属机构Id
-//        czr.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR));
-        czr.setSsjgbm("370203032003");
+        czr.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR));
         // 所属机构
-//        czr.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ONE_STR));
-        czr.setSsjg("河西社区");
+        czr.setSsjg(getJgbm(item.getHandlerDeptId(), NumConstant.ONE_STR));
         //所属部门id
-//        czr.setSsbmbm(item.getGridUnitid());
-        czr.setSsbmbm("1202869661668302849");
+        czr.setSsbmbm(item.getGridUnitid());;
         // 所属部门名称
-//        czr.setSsbm(item.getGridUnitname());
-        czr.setSsbm("河西社区");
+        czr.setSsbm(item.getGridUnitname());
 
         // 传数据
         data.setCzr(czr);
@@ -548,23 +542,17 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         // 操作人
         ReportRejectionResultDTO.CzrDTO dto = new ReportRejectionResultDTO.CzrDTO();
         // 操作人姓名
-//        dto.setXm(item.getGridPartyname());
-        dto.setXm("HAHA");
+        dto.setXm(item.getGridPartyname());
         // 操作人员唯一标识
-//        dto.setId(item.getGridPartyid());
-        dto.setId("1572475746788093953");
+        dto.setId(item.getGridPartyid());
         // 所属机构id
-//        dto.setSsjgbm(getJgbm(item.getHandlerDeptId()));
-        dto.setSsjgbm("370203032003");
+        dto.setSsjgbm(getJgbm(item.getHandlerDeptId(), NumConstant.ZERO_STR));
         // 所属机构名称
-//        dto.setSsjg(item.getGridUnitname());
-        dto.setSsjg("河西社区");
+        dto.setSsjg(item.getGridUnitname());
         // 所属部门id
-//        dto.setSsbmbm(item.getGridUnitid());
-        dto.setSsbmbm("1202869661668302849");
+        dto.setSsbmbm(item.getGridUnitid());;
         // 所属部门名称
-//        dto.setSsbm(item.getGridUnitname());
-        dto.setSsbm("河西社区");
+        dto.setSsbm(item.getGridUnitname());
 
         // 组装完成，推送
         data.setCzr(dto);