From eb7bb07ec6c2cd80996350927258d0c01dd3614f Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Wed, 22 Oct 2025 14:41:49 +0800 Subject: [PATCH] udpate --- .../module/mdm/controller/BankController.java | 2 +- .../controller/CountryRegionController.java | 24 ++++++++++++++++++- .../mdm/controller/CurrencyController.java | 2 +- .../mdm/controller/PriceTermsController.java | 2 +- 4 files changed, 26 insertions(+), 4 deletions(-) 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 b36dd0b..6828735 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 @@ -88,7 +88,7 @@ public class BankController { @ApiOperation(value="根据id查询LngBBank数据详细日志") @SaCheckPermission("bank:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngBBankDto.class,id); return R.ok(logs); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java index 56cf047..a531947 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java @@ -21,9 +21,11 @@ import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.common.utils.VoToColumnUtil; import com.xjrsoft.module.datalog.entity.DataChangeLog; import com.xjrsoft.module.datalog.service.DatalogService; +import com.xjrsoft.module.datalog.vo.DataChangeLogVo; import com.xjrsoft.module.mdm.dto.LngBRegionPageDto; import com.xjrsoft.module.mdm.dto.UpdateLngBRegionDto; import com.xjrsoft.module.mdm.entity.LngBRegion; +import com.xjrsoft.module.mdm.enums.CountryRegionEnum; import com.xjrsoft.module.mdm.service.ICountryRegionService; import com.xjrsoft.module.mdm.vo.LngBRegionPageVo; import com.xjrsoft.module.mdm.vo.LngBRegionVo; @@ -88,7 +90,7 @@ public class CountryRegionController { @ApiOperation(value="根据id查询LngBRegion数据详细日志") @SaCheckPermission("countryRegion:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngBRegionDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngBRegionDto.class,id); return R.ok(logs); } @@ -97,6 +99,16 @@ public class CountryRegionController { @ApiOperation(value = "新增LngBRegion") @SaCheckPermission("countryRegion:add") public R add(@Valid @RequestBody UpdateLngBRegionDto dto){ + if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { + if(dto.getPid() != null && dto.getPid() != 0) { + LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); + if(parentRegion != null) { + dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); + } + } + }else { + dto.setFullPath(dto.getFullName()); + } UpdateLngBRegionDto res = dataService.insert(dto); return R.ok(res.getId()); } @@ -105,6 +117,16 @@ public class CountryRegionController { @ApiOperation(value = "修改LngBRegion") @SaCheckPermission("countryRegion:edit") public R update(@Valid @RequestBody UpdateLngBRegionDto dto){ + if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) { + if(dto.getPid() != null && dto.getPid() != 0) { + LngBRegion parentRegion = countryRegionService.getById(dto.getPid()); + if(parentRegion != null) { + dto.setFullPath(parentRegion.getFullPath()+dto.getFullName()); + } + } + }else { + dto.setFullPath(dto.getFullName()); + } return R.ok(dataService.updateById(dto)); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java index c748afb..bbe6fc5 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CurrencyController.java @@ -83,7 +83,7 @@ public class CurrencyController { @ApiOperation(value="根据id查询LngBCurrency数据详细日志") @SaCheckPermission("currency:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngBCurrencyDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngBCurrencyDto.class,id); return R.ok(logs); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java index 3a1af0b..cdb46ca 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PriceTermsController.java @@ -84,7 +84,7 @@ public class PriceTermsController { @ApiOperation(value="根据id查询LngBPriceTerm数据详细日志") @SaCheckPermission("priceTerms:datalog") public R datalog(@RequestParam Long id){ - List logs = dataService.findLogsByEntityId(UpdateLngBPriceTermDto.class,id); + List logs = dataService.findLogsByEntityId(UpdateLngBPriceTermDto.class,id); return R.ok(logs); }