From bc9cee6d40b4d434a0aa1bbbc1e3332644ddf2a5 Mon Sep 17 00:00:00 2001
From: HAHA <1824278510@qq.com>
Date: Mon, 26 Sep 2022 17:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E9=A9=B3=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E6=B4=BE=E9=81=A3=E5=AE=A1=E6=A0=B8=E5=A1=AB=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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