diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java index fe0e8e1..2422533 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/LngBBankPageVo.java @@ -48,6 +48,7 @@ public class LngBBankPageVo { * 所属国家和地区 */ @ApiModelProperty("所属国家和地区") + @Trans(type = TransType.REGION, transToFieldName = "regionName") private String regionCode; /** * SWIFT @@ -66,10 +67,10 @@ public class LngBBankPageVo { @ApiModelProperty("数据权限id") private Long ruleUserId; - /** - * 所属国家和地区 - */ - @ApiModelProperty("所属国家和地区名称") - private String regionName; + + + private String regionName; + + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java index f2f7cbd..e53e744 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java @@ -81,9 +81,6 @@ public class BankController { .select(LngBBank.class,x -> VoToColumnUtil.fieldsToColumns(LngBBankPageVo.class).contains(x.getProperty())); IPage page = bankService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBBankPageVo.class); - List list = pageOutput.getList(); - setRegionName(list); - return R.ok(pageOutput); } @@ -163,23 +160,5 @@ public class BankController { return R.ok(dataService.disable(UpdateLngBBankDto.class,ids)); } - private void setRegionName(List list) { - if(CollectionUtil.isNotEmpty(list)) { - for(LngBBankPageVo vo: list) { - if(StrUtil.isNotBlank(vo.getRegionCode())) { - String[] regionArr = vo.getRegionCode().split(","); - if(regionArr != null && regionArr.length > 0) { - String lastRegionCode = regionArr[regionArr.length-1]; - LambdaQueryWrapper regionQueryWrapper = new LambdaQueryWrapper<>(); - regionQueryWrapper.eq(LngBRegion::getCode, lastRegionCode); - LngBRegion lastRegion = regionService.getOne(regionQueryWrapper); - if(lastRegion != null) { - vo.setRegionName(lastRegion.getFullPath()); - } - } - - } - } - } - } + } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java index d66c4b3..832e49d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java @@ -135,10 +135,13 @@ public class CountryRegionServiceImpl extends ServiceImpl { - CacheUtil.refreshRegionList(); + CacheUtil.refreshRegionList(); }); + } }