bug

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

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 import com.elink.esua.epdc.service.GisService;
@@ -365,7 +366,7 @@ public class SysDeptController {
      * @date 2022/9/26 16:53
      */
     @GetMapping("getZoneCode")
-    public Result getZoneCode(String cantonCode) {
+    public Result<SysDeptAreaCodeResultDTO> getZoneCode(String cantonCode) {
         return sysDeptService.getZoneCode(cantonCode);
     }
 

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

@@ -17,6 +17,7 @@ import com.elink.esua.epdc.dto.epdc.form.ExportTemplateInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.ExportKpiResultDTO;
+import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO;
 import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO;
 import com.elink.esua.epdc.entity.SysDeptEntity;
 
@@ -302,7 +303,7 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @author zhy
      * @date 2022/9/26 16:53
      */
-    Result getZoneCode(String cantonCode);
+    Result<SysDeptAreaCodeResultDTO> getZoneCode(String cantonCode);
 
     /**
      * @param formDTO

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

@@ -1291,7 +1291,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     }
 
     @Override
-    public Result getZoneCode(String cantonCode) {
+    public Result<SysDeptAreaCodeResultDTO> getZoneCode(String cantonCode) {
         SysDeptAreaCodeResultDTO dept = baseDao.selectByAreaCode(cantonCode);
         return new Result<SysDeptAreaCodeResultDTO>().ok(dept);
     }

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

@@ -4,6 +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.Result;
 import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO;
 import com.elink.esua.epdc.modules.feign.fallback.AdminFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -119,7 +120,7 @@ public interface AdminFeignClient {
      * @date 2022/9/26 16:53
      */
     @GetMapping(value="sys/dept/getZoneCode", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result getZoneCode(@RequestParam("cantonCode") String cantonCode);
+    Result<SysDeptAreaCodeResultDTO>  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

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.*;
+import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -65,7 +66,7 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     }
 
     @Override
-    public Result getZoneCode(String cantonCode) {
+    public Result<SysDeptAreaCodeResultDTO> getZoneCode(String cantonCode) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getZoneCode", cantonCode);
     }
 

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

@@ -3663,10 +3663,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemHandleProcessDto.setGridCantoncode(formDto.getCantoncode());
         //根据网格化区域编码获取对应的市中心区域编码
         if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) {
-            Result<String> result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode());
+            Result<SysDeptAreaCodeResultDTO> result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode());
-            String zoneCode = result.getData();
+            SysDeptAreaCodeResultDTO dept = result.getData();
+            if (dept != null) {
+                String zoneCode = dept.getDisCenterZoningCode();
                 itemHandleProcessDto.setDisCenterZoningCode(zoneCode);
             }
+        }
         if("0".equals(formDto.getState())){
             ItemEntity item = baseDao.selectById(itemPlat.getReferenceId());
             log.info("根据id查询数据");

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml

@@ -130,6 +130,8 @@
         and
             p.state = #{state}
         and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
+        order by p.CREATED_TIME desc
+        limit 1
     </select>
     <select id="getHandler"
             resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProcessCaseClosedToCityDTO">