保存新增的字段

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

@@ -356,6 +356,19 @@ public class SysDeptController {
         return sysDeptService.getDeptTypeKey(deptId);
     }
 
+    /**
+     * 网格化行政代码 转 区中心行政代码
+     *
+     * @param cantonCode
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/9/26 16:53
+     */
+    @GetMapping("getZoneCode")
+    public Result getZoneCode(String cantonCode) {
+        return sysDeptService.getZoneCode(cantonCode);
+    }
+
     /**
      * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>

esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java

@@ -277,4 +277,5 @@ public interface SysDeptDao extends BaseDao<SysDeptEntity> {
     * @return com.elink.esua.epdc.entity.SysDeptEntity
     */
     SysDeptEntity selectByAreaCode(@Param("areaCode") String areaCode);
+
 }

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

@@ -294,6 +294,16 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      */
     Result getDeptTypeKey(Long deptId);
 
+    /**
+     * 网格化行政代码 转 区中心行政代码
+     *
+     * @param cantonCode
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/9/26 16:53
+     */
+    Result getZoneCode(String cantonCode);
+
     /**
      * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO>>

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

@@ -1289,6 +1289,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
         return new Result<String>().ok(dept.getTypeKey());
     }
 
+    @Override
+    public Result getZoneCode(String cantonCode) {
+        String zoneCode = "";
+        SysDeptEntity dept = baseDao.selectByAreaCode(cantonCode);
+        if (dept != null) {
+            zoneCode = dept.getDisCenterZoningCode();
+        }
+        return new Result<String>().ok(zoneCode);
+    }
 
     @Override
     public List<UserSysDeptInfoResultDTO> queryUserSysDeptTypeKey(UserSysDeptInfoFormDTO formDTO) {

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

@@ -110,6 +110,16 @@ public interface AdminFeignClient {
     @GetMapping(value="sys/dept/getDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result getDeptTypeKey(@RequestParam("deptId") Long deptId);
 
+    /**
+     * 网格化行政代码 转 区中心行政代码
+     *
+     * @param cantonCode
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/9/26 16:53
+     */
+    @GetMapping(value="sys/dept/getZoneCode", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getZoneCode(@RequestParam("cantonCode") String cantonCode);
 
     /**
      * 根据部门ID获取所有上级机构名称和ID拼接

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

@@ -64,6 +64,11 @@ public class AdminFeignClientFallback implements AdminFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId);
     }
 
+    @Override
+    public Result getZoneCode(String cantonCode) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getZoneCode", cantonCode);
+    }
+    
     @Override
     public Result<ParentAndAllDeptDTO> getParentAndAllDept(Long deptId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId);

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

@@ -2428,6 +2428,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
                 itemHandleProcessDto.setGridNextunitid(dto.getNEXTUNITID());
                 itemHandleProcessDto.setGridNextunitname(dto.getNEXTUNITNAME());
                 itemHandleProcessDto.setGridTaskcnname(dto.getTASKCNNAME());
+
+                itemHandleProcessDto.setGridCantoncode(dto.getCANTONCODE());
+                itemHandleProcessDto.setGridNextcantoncode(dto.getNEXTCANTONCODE());
+                itemHandleProcessDto.setGridDelayhour(dto.getDELAYHOUR());
+                itemHandleProcessDto.setGridDelayresult(dto.getDELAYRESULT());
+
                 itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto);
 
                 // 插入网格化平台处理记录表