市平台增加入参

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

@@ -98,4 +98,13 @@ public class CityCaseDevelopDTO implements Serializable {
      *上报说明
      */
     private String sbsm;
+
+    /**
+     *处置标识  字典3.7
+     * 01	社区处置
+     * 02	街道处置
+     * 03	区市处置
+     * 04	市级处置（12345处置）
+     */
+    private String czbs;
 }

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

@@ -119,4 +119,13 @@ public class CityCaseLawenforcementDTO implements Serializable {
      *上报说明
      */
     private String sbsm;
+
+    /**
+     *处置标识  字典3.7
+     * 01	社区处置
+     * 02	街道处置
+     * 03	区市处置
+     * 04	市级处置（12345处置）
+     */
+    private String czbs;
 }

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

@@ -103,4 +103,13 @@ public class CityCaseLivelihoodDTO implements Serializable {
      *上报说明
      */
     private String sbsm;
+
+    /**
+     *处置标识  字典3.7
+     * 01	社区处置
+     * 02	街道处置
+     * 03	区市处置
+     * 04	市级处置（12345处置）
+     */
+    private String czbs;
 }

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

@@ -48,6 +48,16 @@ public class AppealDispatchResultDto {
     @JsonProperty("pqlist")
     private List<PqlistDTO> pqlist;
 
+    /**
+     *处置标识  字典3.7
+     * 01	社区处置
+     * 02	街道处置
+     * 03	区市处置
+     * 04	市级处置（12345处置）
+     */
+    @JsonProperty("czbs")
+    private String czbs;
+
     @NoArgsConstructor
     @Data
     public static class CzrDTO {

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

@@ -24,6 +24,15 @@ public class DispatchAuditResultDto {
     private String shjg;
     @JsonProperty("cznr")
     private String cznr;
+    /**
+     *处置标识  字典3.7
+     * 01	社区处置
+     * 02	街道处置
+     * 03	区市处置
+     * 04	市级处置（12345处置）
+     */
+    @JsonProperty("czbs")
+    private String czbs;
 
     @NoArgsConstructor
     @Data

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

@@ -58,6 +58,16 @@ public class RebutAuditResultDTO {
     @JsonProperty("cznr")
     private String cznr;
 
+    /**
+     *处置标识  字典3.7
+     * 01	社区处置
+     * 02	街道处置
+     * 03	区市处置
+     * 04	市级处置（12345处置）
+     */
+    @JsonProperty("czbs")
+    private String czbs;
+
     @NoArgsConstructor
     @Data
     public static class CzrDTO {

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

@@ -53,6 +53,16 @@ public class RebutResultDTO {
     @JsonProperty("cznr")
     private String cznr;
 
+    /**
+     *处置标识  字典3.7
+     * 01	社区处置
+     * 02	街道处置
+     * 03	区市处置
+     * 04	市级处置（12345处置）
+     */
+    @JsonProperty("czbs")
+    private String czbs;
+
     @NoArgsConstructor
     @Data
     public static class CzrDTO {

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

@@ -216,4 +216,11 @@ public interface PushToCityGridService {
      */
     void appealAudit(String processId);
 
+    /**
+     * 获取项目节点数据操作人对应的处置标识
+     * @param code
+     * @return
+     */
+    String getItemCzbs(String code);
+
 }

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

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.item.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.CityPushEnum;
 import com.elink.esua.epdc.commons.tools.enums.CityPushLinkEnum;
@@ -32,6 +33,7 @@ import com.elink.esua.epdc.constant.PushToCityGridConstant;
 import com.elink.esua.epdc.dto.CityCenterFromDTO;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO;
 import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO;
 import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
 import com.elink.esua.epdc.dto.item.result.*;
@@ -123,6 +125,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             czrDTO.setSsbmbm(item.getDisCenterZoningCode());
             czrDTO.setSsbm(item.getGridUnitname());
             data.setCzr(czrDTO);
+            data.setCzbs(getItemCzbs(item.getGridCantoncode()));
 
             // 组装派遣信息
             List<AppealDispatchResultDto.PqlistDTO> pqlist = new ArrayList<>();
@@ -375,6 +378,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
             // 组装完成，推送
             data.setCzr(dto);
+            data.setCzbs(getItemCzbs(item.getGridCantoncode()));
             String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.DISP_ATCH_AUDIT, "派遣审核");
 
             saveLog(item.getItemId(), item.getId(), "派遣审核", PushToCityGridConstant.DISP_ATCH_AUDIT, JSONObject.toJSONString(data), result);
@@ -728,6 +732,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             dto.setDqclhj(CityPushLinkEnum.SQ_CL.getCode());
             dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
             dto.setCznr(item.getHandleAdvice());
+            dto.setCzbs(getItemCzbs(item.getGridCantoncode()));
             RebutResultDTO.CzrDTO czr = new RebutResultDTO.CzrDTO();
             czr.setId(item.getGridPartyid());
             czr.setXm(item.getGridPartyname());
@@ -771,6 +776,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
             dto.setShjg("0");
             dto.setCznr(item.getHandleAdvice());
+            dto.setCzbs(getItemCzbs(item.getGridCantoncode()));
             //操作人
             RebutAuditResultDTO.CzrDTO czr = new RebutAuditResultDTO.CzrDTO();
             czr.setId(item.getGridPartyid());
@@ -913,6 +919,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             dto.setCzsj(DateUtils.format(item.getCreatedTime(),DateUtils.DATE_TIME_PATTERN));
             dto.setShjg("1");//审核通过
             dto.setCznr(item.getHandleAdvice());
+            dto.setCzbs(getItemCzbs(item.getGridCantoncode()));
             //操作人
             RebutAuditResultDTO.CzrDTO czr = new RebutAuditResultDTO.CzrDTO();
             czr.setId(item.getGridPartyid());
@@ -1226,4 +1233,36 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         return "";
     }
 
+    /**
+     * 获取项目节点数据操作人对应的处置标识
+     * @param code
+     * @return
+     */
+    @Override
+    public String getItemCzbs(String code) {
+        if (StringUtils.isEmpty(code)) {
+            return "02";
+        }
+        Result<SysDeptAreaCodeResultDTO> result = adminFeignClient.getZoneCode(code);
+        if (result.success() && null != result.getData()) {
+            String str = "";
+            switch (result.getData().getTypeKey()) {
+                case "grid_party":
+                case "community_party":
+                    str = "01";
+                    break;
+                case "street_party":
+                    str = "02";
+                    break;
+                case "district_dept":
+                    str = "03";
+                    break;
+                default:
+                    str = "02";
+            }
+            return str;
+        }
+        return "02";
+    }
+
 }