Merge remote-tracking branch 'origin/feature/pushCaseTo_city' into feature/pushCaseTo_city

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 889ada4f41f61e509058b2cfd4b37d07904c802e
+Subproject commit 5b952479b717d89a8c382da1c9bcbeeb4f9050bd

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemHandleProcessDTO.java

@@ -124,4 +124,50 @@ public class ItemHandleProcessDTO implements Serializable {
      * 是否已删除(0-未删除，1-已删除)
      */
     private String delFlag;
+
+    /**
+     * 网格化平台-操作人标识
+     */
+    private String gridPartyid;
+
+    /**
+     * 网格化平台-操作人名称
+     */
+    private String gridPartyname;
+
+    /**
+     * 网格化平台-单位标识
+     */
+    private String gridUnitid;
+
+    /**
+     * 网格化平台-单位名称
+     */
+    private String gridUnitname;
+
+    /**
+     * 网格化平台-被派遣人员标识
+     */
+    private String gridNextpartid;
+
+    /**
+     * 网格化平台-被派遣人员名称
+     */
+    private String gridNextpartname;
+
+    /**
+     * 网格化平台-被派遣单位标识
+     */
+    private String gridNextunitid;
+
+    /**
+     * 网格化平台-被派遣单位名称
+     */
+    private String gridNextunitname;
+
+    /**
+     * 网格化平台-动作名称
+     */
+    private String gridTaskcnname;
+
 }

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

@@ -118,7 +118,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             dto.setCzsj(item.getCreatedTime().toString());
             dto.setCznr(item.getHandleAdvice());
             AppealScrapResultDTO.CzrDTO czr = new AppealScrapResultDTO.CzrDTO();
-            // todo
+            czr.setId(item.getGridPartyid());
+            czr.setXm(item.getGridPartyname());
+            czr.setSsjgbm(item.getGridUnitid());
+            czr.setSsbm(item.getGridUnitname());
             dto.setCzr(czr);
             // 组装好直接推送
             cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_SCRAP, "诉求废弃");