diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 68690d9cf..a19f91690 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/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 getZoneCode(String cantonCode) { return sysDeptService.getZoneCode(cantonCode); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index c88f918a3..ab465f76a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/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 { * @author zhy * @date 2022/9/26 16:53 */ - Result getZoneCode(String cantonCode); + Result getZoneCode(String cantonCode); /** * @param formDTO diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index d22d8e66d..8a5ee3bdc 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/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 getZoneCode(String cantonCode) { SysDeptAreaCodeResultDTO dept = baseDao.selectByAreaCode(cantonCode); return new Result().ok(dept); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java index 1b95e926b..d0897666d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java +++ b/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 getZoneCode(@RequestParam("cantonCode") String cantonCode); /** * 根据部门ID获取所有上级机构名称和ID拼接 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java index 03f9e3623..a8514c062 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java +++ b/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 getZoneCode(String cantonCode) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getZoneCode", cantonCode); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 4d6176619..270e7dbbd 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -3663,9 +3663,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleProcessDto.setGridCantoncode(formDto.getCantoncode()); //根据网格化区域编码获取对应的市中心区域编码 if (StringUtils.isNotBlank(itemHandleProcessDto.getGridCantoncode())) { - Result result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode()); - String zoneCode = result.getData(); - itemHandleProcessDto.setDisCenterZoningCode(zoneCode); + Result result = adminFeignClient.getZoneCode(itemHandleProcessDto.getGridCantoncode()); + 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()); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml index 22fa5ea89..b4a844d9d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemHandleProcessDao.xml +++ b/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