修改

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/CityCenterFromDTO.java

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/9/23 16:07
+ */
+@Data
+public class CityCenterFromDTO implements Serializable {
+    /**
+     * 0 本级， 1 上级
+     */
+    private String type;
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+}

esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java

@@ -100,6 +100,11 @@ public class SysDeptDTO extends TreeNode implements Serializable {
      */
     private String areaCode;
 
+    /**
+     * 市中心区划编码
+     */
+    private String disCenterZoningCode;
+
     public String getPartyCode() {
         return partyCode;
     }
@@ -215,4 +220,12 @@ public class SysDeptDTO extends TreeNode implements Serializable {
     public void setAreaCode(String areaCode) {
         this.areaCode = areaCode;
     }
+
+    public String getDisCenterZoningCode() {
+        return disCenterZoningCode;
+    }
+
+    public void setDisCenterZoningCode(String disCenterZoningCode) {
+        this.disCenterZoningCode = disCenterZoningCode;
+    }
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java

@@ -485,4 +485,18 @@ public class SysDeptController {
         sysDeptService.getCompanyList();
         return new Result();
     }
+
+    /**
+     * 获取部门信息
+     *
+     * @Param formDTO
+     * @Return {@link Result< SysDeptDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/9/23 16:14
+     */
+    @PostMapping("getDept")
+    public Result<SysDeptDTO> getDept(@RequestBody CityCenterFromDTO formDTO) {
+        return new Result<SysDeptDTO>().ok(sysDeptService.getDept(formDTO));
+    }
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java

@@ -107,4 +107,9 @@ public class SysDeptEntity extends BaseEntity {
     /**第三方编码
      */
     private String infoCode;
+
+    /**
+     * 市中心区划编码
+     */
+    private String disCenterZoningCode;
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java

@@ -378,4 +378,14 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      */
     void getCompanyList();
 
+    /**
+     * 获取部门信息
+     *
+     * @Param formDTO
+     * @Return {@link SysDeptDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/9/23 16:17
+     */
+    SysDeptDTO getDept(CityCenterFromDTO formDTO);
+
 }

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@@ -1453,6 +1453,24 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         System.out.println(resultStr);
     }
 
+    /**
+     * 获取部门信息
+     *
+     * @param formDTO
+     * @Param formDTO
+     * @Return {@link SysDeptDTO}
+     * @Author zhaoqifeng
+     * @Date 2022/9/23 16:17
+     */
+    @Override
+    public SysDeptDTO getDept(CityCenterFromDTO formDTO) {
+        SysDeptEntity entity = baseDao.selectById(formDTO.getDeptId());
+        if (NumConstant.ONE_STR.equals(formDTO.getType())) {
+            return ConvertUtils.sourceToTarget(baseDao.selectById(entity.getDisCenterZoningCode()), SysDeptDTO.class);
+        }
+        return ConvertUtils.sourceToTarget(entity, SysDeptDTO.class);
+    }
+
     /**
      * @return java.lang.String
      * @describe: 访问外部接口获取部门（社区）地区编码

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

@@ -64,8 +64,8 @@ public class PushToCityGridCaseClosedDTO {
         /**
          * 所属机构id
          */
-        @JsonProperty("ssjgid")
-        private String ssjgid;
+        @JsonProperty("ssjgbm")
+        private String ssjgbm;
 
         /**
          * 所属机构
@@ -76,13 +76,13 @@ public class PushToCityGridCaseClosedDTO {
         /**
          * 所属部门id
          */
-        @JsonProperty("ssbmid")
-        private String ssbmid;
+        @JsonProperty("ssbmbm")
+        private String ssbmbm;
 
         /**|
          * 所属部门
          */
-        @JsonProperty("ssbmmc")
-        private String ssbmmc;
+        @JsonProperty("ssbm")
+        private String ssbm;
     }
 }

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

@@ -40,13 +40,13 @@ public class AppealHandlingResultDTO {
         private String id;
         @JsonProperty("xm")
         private String xm;
-        @JsonProperty("ssjgid")
-        private String ssjgid;
-        @JsonProperty("ssjgmc")
-        private String ssjgmc;
-        @JsonProperty("ssbmid")
-        private String ssbmid;
-        @JsonProperty("ssbmmc")
-        private String ssbmmc;
+        @JsonProperty("ssjgbm")
+        private String ssjgbm;
+        @JsonProperty("ssjg")
+        private String ssjg;
+        @JsonProperty("ssbmbm")
+        private String ssbmbm;
+        @JsonProperty("ssbm")
+        private String ssbm;
     }
 }

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

@@ -30,13 +30,13 @@ public class AppealReportResultDTO {
         private String id;
         @JsonProperty("xm")
         private String xm;
-        @JsonProperty("ssjgid")
-        private String ssjgid;
-        @JsonProperty("ssjgmc")
-        private String ssjgmc;
-        @JsonProperty("ssbmid")
-        private String ssbmid;
-        @JsonProperty("ssbmmc")
-        private String ssbmmc;
+        @JsonProperty("ssjgbm")
+        private String ssjgbm;
+        @JsonProperty("ssjg")
+        private String ssjg;
+        @JsonProperty("ssbmbm")
+        private String ssbmbm;
+        @JsonProperty("ssbm")
+        private String ssbm;
     }
 }

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

@@ -53,18 +53,18 @@ public class EarlyInspectionApplyResultDTO implements Serializable {
         /**
          * 所属机构Id
          */
-        private String ssjgid;
+        private String ssjgbm;
         /**
          * 所属机构
          */
-        private String ssjgmc;
+        private String ssjg;
         /**
          * 所属部门Id
          */
-        private String ssbmid;
+        private String ssbmbm;
         /**
          * 所属部门
          */
-        private String ssbmmc;
+        private String ssbm;
     }
 }

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

@@ -58,18 +58,18 @@ public class EarlyInspectionResultDTO implements Serializable {
         /**
          * 所属机构Id
          */
-        private String ssjgid;
+        private String ssjgbm;
         /**
          * 所属机构
          */
-        private String ssjgmc;
+        private String ssjg;
         /**
          * 所属部门Id
          */
-        private String ssbmid;
+        private String ssbmbm;
         /**
          * 所属部门
          */
-        private String ssbmmc;
+        private String ssbm;
     }
 }

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

@@ -58,18 +58,18 @@ public class EndInspectionResultDTO implements Serializable {
         /**
          * 所属机构Id
          */
-        private String ssjgid;
+        private String ssjgbm;
         /**
          * 所属机构
          */
-        private String ssjgmc;
+        private String ssjg;
         /**
          * 所属部门Id
          */
-        private String ssbmid;
+        private String ssbmbm;
         /**
          * 所属部门
          */
-        private String ssbmmc;
+        private String ssbm;
     }
 }

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

@@ -58,18 +58,18 @@ public class EvaluationResultDTO implements Serializable {
         /**
          * 所属机构Id
          */
-        private String ssjgid;
+        private String ssjgbm;
         /**
          * 所属机构
          */
-        private String ssjgmc;
+        private String ssjg;
         /**
          * 所属部门Id
          */
-        private String ssbmid;
+        private String ssbmbm;
         /**
          * 所属部门
          */
-        private String ssbmmc;
+        private String ssbm;
     }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java

@@ -3,16 +3,11 @@ package com.elink.esua.epdc.modules.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.CompleteDeptDTO;
-import com.elink.esua.epdc.dto.DeptGridPlatformDTO;
-import com.elink.esua.epdc.dto.DeptInfoCodeDTO;
-import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.modules.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -126,4 +121,7 @@ public interface AdminFeignClient {
      */
     @GetMapping("sys/dept/getParentAndAllDept/{deptId}")
     Result<ParentAndAllDeptDTO> getParentAndAllDept(@PathVariable("deptId") Long deptId);
+
+    @PostMapping(value = "sys/dept/getDept", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<SysDeptDTO> getDept(@RequestBody CityCenterFromDTO formDTO);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java

@@ -4,10 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.CompleteDeptDTO;
-import com.elink.esua.epdc.dto.DeptGridPlatformDTO;
-import com.elink.esua.epdc.dto.DeptInfoCodeDTO;
-import com.elink.esua.epdc.dto.SysDeptDTO;
+import com.elink.esua.epdc.dto.*;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -71,4 +68,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<ParentAndAllDeptDTO> getParentAndAllDept(Long deptId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);
     }
+
+    @Override
+    public Result<SysDeptDTO> getDept(CityCenterFromDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDept", formDTO);
+    }
 }

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

@@ -29,11 +29,14 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.PushToCityGridConstant;
+import com.elink.esua.epdc.dto.CityCenterFromDTO;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO;
 import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum;
 import com.elink.esua.epdc.gird.city.api.CityGridApi;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.item.dao.ItemDao;
 import com.elink.esua.epdc.modules.item.dao.ItemGridPlatformDao;
 import com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao;
@@ -85,6 +88,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
     private ItemReportInterfaceLogDao itemReportInterfaceLogDao;
     @Resource
     private ItemGridPlatformDao itemGridPlatformDao;
+    @Resource
+    private AdminFeignClient adminFeignClient;
 
 
     @Override
@@ -230,13 +235,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         // 操作人员唯一标识
         czr.setId(item.getGridPartyid());
         // 所属机构Id
-        czr.setSsjgid(item.getGridUnitid());
+        czr.setSsjgbm(item.getGridUnitid());
         // 所属机构
         czr.setSsjg(item.getGridUnitname());
         //所属部门id
-        czr.setSsbmid(item.getGridUnitid());
+        czr.setSsbmbm(item.getGridUnitid());
         // 所属部门名称
-        czr.setSsbmmc(item.getGridUnitname());
+        czr.setSsbm(item.getGridUnitname());
 
         // 传数据
         data.setCzr(czr);
@@ -246,6 +251,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         return new Result();
     }
 
+
+
     @Override
     public void appealSupervise(ItemHandleProcessDTO processDTO) {
         if (null != processDTO && StringUtils.isNotBlank(processDTO.getId())) {
@@ -455,13 +462,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         // 操作人员唯一标识
         dto.setId(item.getGridPartyid());
         // 所属机构id
-        dto.setSsjgid(item.getGridUnitid());
+        dto.setSsjgbm(item.getGridUnitid());
         // 所属机构名称
-        dto.setSsjgmc(item.getGridUnitname());
+        dto.setSsjg(item.getGridUnitname());
         // 所属部门id
-        dto.setSsbmid(item.getGridUnitid());
+        dto.setSsbmbm(item.getGridUnitid());
         // 所属部门名称
-        dto.setSsbmmc(item.getGridUnitname());
+        dto.setSsbm(item.getGridUnitname());
 
         // 组装完成，推送
         data.setCzr(dto);
@@ -612,13 +619,13 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         // 操作人员唯一标识
         dto.setId(item.getGridPartyid());
         // 所属机构id
-        dto.setSsjgid(item.getGridUnitid());
+        dto.setSsjgbm(item.getGridUnitid());
         // 所属机构名称
-        dto.setSsjgmc(item.getGridUnitname());
+        dto.setSsjg(item.getGridUnitname());
         // 所属部门id
-        dto.setSsbmid(item.getGridUnitid());
+        dto.setSsbmbm(item.getGridUnitid());
         // 所属部门名称
-        dto.setSsbmmc(item.getGridUnitname());
+        dto.setSsbm(item.getGridUnitname());
         // 组装完成，推送
         data.setCzr(dto);
         String result = cityGridApi.sendItemToCity(data, PushToCityGridConstant.HANDLE, "诉求处理");
@@ -926,10 +933,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             EvaluationResultDTO.CzrBean czr = new EvaluationResultDTO.CzrBean();
             czr.setId(item.getUserId());
             czr.setXm(item.getNickName());
-            czr.setSsbmid(item.getGridId().toString());
-            czr.setSsbmmc(item.getGrid());
-            czr.setSsbmid(item.getGridId().toString());
-            czr.setSsjgmc(item.getGrid());
+            czr.setSsbmbm(item.getGridId().toString());
+            czr.setSsbm(item.getGrid());
+            czr.setSsjgbm(getJgbm(item.getPeopleFlag(), item.getGridId()));
+            czr.setSsjg(item.getGrid());
             dto.setCzr(czr);
             // 组装好直接推送
 
@@ -979,10 +986,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             EarlyInspectionApplyResultDTO.SqrBean sqr = new EarlyInspectionApplyResultDTO.SqrBean();
             sqr.setId(item.getGridPartyid());
             sqr.setXm(item.getGridPartyname());
-            sqr.setSsbmid(item.getGridUnitid());
-            sqr.setSsbmmc(item.getGridUnitname());
-            sqr.setSsbmid(item.getGridUnitid());
-            sqr.setSsjgmc(item.getGridUnitname());
+            sqr.setSsbmbm(item.getGridUnitid());
+            sqr.setSsbm(item.getGridUnitname());
+            sqr.setSsjgbm(item.getGridUnitid());
+            sqr.setSsjg(item.getGridUnitname());
             dto.setSqr(sqr);
             // 组装好直接推送
             String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.EARLY_INSPECTION_APPLY, "初验申请");
@@ -1035,10 +1042,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             EarlyInspectionResultDTO.CzrBean czr = new EarlyInspectionResultDTO.CzrBean();
             czr.setId(item.getGridPartyid());
             czr.setXm(item.getGridPartyname());
-            czr.setSsbmid(item.getGridUnitid());
-            czr.setSsbmmc(item.getGridUnitname());
-            czr.setSsbmid(item.getGridUnitid());
-            czr.setSsjgmc(item.getGridUnitname());
+            czr.setSsbmbm(item.getGridUnitid());
+            czr.setSsbm(item.getGridUnitname());
+            czr.setSsjgbm(item.getGridUnitid());
+            czr.setSsjg(item.getGridUnitname());
             dto.setCzr(czr);
             // 组装好直接推送
             String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.EARLY_INSPECTION, "诉求初验");
@@ -1094,10 +1101,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             EndInspectionResultDTO.CzrBean czr = new EndInspectionResultDTO.CzrBean();
             czr.setId(item.getGridPartyid());
             czr.setXm(item.getGridPartyname());
-            czr.setSsbmid(item.getGridUnitid());
-            czr.setSsbmmc(item.getGridUnitname());
-            czr.setSsbmid(item.getGridUnitid());
-            czr.setSsjgmc(item.getGridUnitname());
+            czr.setSsbmbm(item.getGridUnitid());
+            czr.setSsbm(item.getGridUnitname());
+            czr.setSsjgbm(item.getGridUnitid());
+            czr.setSsjg(item.getGridUnitname());
             dto.setCzr(czr);
             // 组装好直接推送
             String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.END_INSPECTION, "诉求终验");
@@ -1148,4 +1155,27 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         itemReportInterfaceLogDao.insert(log);
     }
 
+    /**
+     * 获取机构编码
+     * @Param peopleFlag
+     * @Param deptId
+     * @Return {@link String}
+     * @Author zhaoqifeng
+     * @Date 2022/9/23 16:58
+     */
+    private String getJgbm(String peopleFlag, Long deptId) {
+        CityCenterFromDTO formDTO = new CityCenterFromDTO();
+        formDTO.setDeptId(deptId);
+        if (NumConstant.ZERO_STR.equals(peopleFlag)) {
+            formDTO.setType(NumConstant.ONE_STR);
+        }else {
+            formDTO.setType(NumConstant.ZERO_STR);
+        }
+        Result<SysDeptDTO> dept = adminFeignClient.getDept(formDTO);
+        if (dept.success()) {
+            return dept.getData().getDisCenterZoningCode();
+        }
+        return "";
+    }
+
 }