From 0821471679012bc24f95f0cbb3676d879c315b2b Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Tue, 28 Oct 2025 15:51:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xjrsoft/module/mdm/controller/BankController.java | 2 +- .../xjrsoft/module/mdm/controller/CountryRegionController.java | 2 +- .../xjrsoft/module/mdm/controller/ExpenseNameController.java | 3 +-- .../module/mdm/controller/PipeGasDownloadPointController.java | 2 +- .../module/mdm/controller/PipelineGgasLineController.java | 2 +- .../com/xjrsoft/module/mdm/controller/TaxRateController.java | 3 +-- 6 files changed, 6 insertions(+), 8 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 6b39eef..41bf1a7 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 @@ -72,7 +72,7 @@ public class BankController { .like(StrUtil.isNotBlank(dto.getFullName()),LngBBank::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getCode()),LngBBank::getCode,dto.getCode()) .like(StrUtil.isNotBlank(dto.getSwift()),LngBBank::getSwift,dto.getSwift()) - .orderByDesc(LngBBank::getCode) + .orderByAsc(LngBBank::getSort,LngBBank::getCode) .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); 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 6d10ac5..803ddf5 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 @@ -72,7 +72,7 @@ public class CountryRegionController { .eq(ObjectUtil.isNotNull(dto.getPid()),LngBRegion::getPid,dto.getPid()) .like(StrUtil.isNotBlank(dto.getFullPath()),LngBRegion::getFullPath,dto.getFullPath()) .like(StrUtil.isNotBlank(dto.getValid()),LngBRegion::getValid,dto.getValid()) - .orderByDesc(LngBRegion::getCode) + .orderByAsc(LngBRegion::getCode) .select(LngBRegion.class,x -> VoToColumnUtil.fieldsToColumns(LngBRegionPageVo.class).contains(x.getProperty())); IPage page = countryRegionService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBRegionPageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java index 969fb3e..7ee4ece 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java @@ -61,9 +61,8 @@ public class ExpenseNameController { .like(StrUtil.isNotBlank(dto.getFullName()),LngBFee::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getValid()),LngBFee::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getCode()),LngBFee::getCode,dto.getCode()) - //.like(StrUtil.isNotBlank(dto.getSort()),LngBFee::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBFee::getNote,dto.getNote()) - .orderByDesc(LngBFee::getCode) + .orderByAsc(LngBFee::getCode,LngBFee::getCode) .select(LngBFee.class,x -> VoToColumnUtil.fieldsToColumns(LngBFeePageVo.class).contains(x.getProperty())); IPage page = expenseNameService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBFeePageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java index 04702d7..28f6972 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipeGasDownloadPointController.java @@ -73,7 +73,7 @@ public class PipeGasDownloadPointController { //.like(StrUtil.isNotBlank(dto.getSort()),LngBStationPng::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getValid()),LngBStationPng::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getNote()),LngBStationPng::getNote,dto.getNote()) - .orderByDesc(LngBStationPng::getCode) + .orderByAsc(LngBStationPng::getSort,LngBStationPng::getCode) .select(LngBStationPng.class,x -> VoToColumnUtil.fieldsToColumns(LngBStationPngPageVo.class).contains(x.getProperty())); IPage page = pipeGasDownloadPointService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBStationPngPageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java index f033342..c5ebcbe 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PipelineGgasLineController.java @@ -65,7 +65,7 @@ public class PipelineGgasLineController { .like(StrUtil.isNotBlank(dto.getStaCodeLng()),LngBPngLine::getStaCodeLng,dto.getStaCodeLng()) //.like(StrUtil.isNotBlank(dto.getSort()),LngBPngLine::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBPngLine::getNote,dto.getNote()) - .orderByDesc(LngBPngLine::getCode) + .orderByAsc(LngBPngLine::getSort,LngBPngLine::getCode) .select(LngBPngLine.class,x -> VoToColumnUtil.fieldsToColumns(LngBPngLinePageVo.class).contains(x.getProperty())); IPage page = pipelineGgasLineService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBPngLinePageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java index b9196b1..6c400fa 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/TaxRateController.java @@ -61,9 +61,8 @@ public class TaxRateController { .like(StrUtil.isNotBlank(dto.getValid()),LngBTax::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getCode()),LngBTax::getCode,dto.getCode()) .eq(ObjectUtil.isNotNull(dto.getRate()),LngBTax::getRate,dto.getRate()) - //.like(StrUtil.isNotBlank(dto.getSort()),LngBTax::getSort,dto.getSort()) .like(StrUtil.isNotBlank(dto.getNote()),LngBTax::getNote,dto.getNote()) - .orderByDesc(LngBTax::getCode) + .orderByAsc(LngBTax::getSort,LngBTax::getCode) .select(LngBTax.class,x -> VoToColumnUtil.fieldsToColumns(LngBTaxPageVo.class).contains(x.getProperty())); IPage page = taxRateService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBTaxPageVo.class); From f8aad0fd815c66f191184f490336c395470aca26 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Tue, 28 Oct 2025 17:04:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xjrsoft/module/mdm/controller/BankController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 41bf1a7..1447b1f 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 @@ -65,11 +65,16 @@ public class BankController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper - .like(StrUtil.isNotBlank(dto.getShortName()),LngBBank::getShortName,dto.getShortName()) + .and( + StrUtil.isNotBlank(dto.getShortName()), r -> + r.like(LngBBank::getShortName, dto.getShortName()) + .or() + .like(LngBBank::getFullName, dto.getShortName()) + ) .like(StrUtil.isNotBlank(dto.getBankCode()),LngBBank::getBankCode,dto.getBankCode()) .like(StrUtil.isNotBlank(dto.getRegionCode()),LngBBank::getRegionCode,dto.getRegionCode()) .like(StrUtil.isNotBlank(dto.getValid()),LngBBank::getValid,dto.getValid()) - .like(StrUtil.isNotBlank(dto.getFullName()),LngBBank::getFullName,dto.getFullName()) + // .like(StrUtil.isNotBlank(dto.getFullName()),LngBBank::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getCode()),LngBBank::getCode,dto.getCode()) .like(StrUtil.isNotBlank(dto.getSwift()),LngBBank::getSwift,dto.getSwift()) .orderByAsc(LngBBank::getSort,LngBBank::getCode) From 80110a4d4647472f8e36559e6b48652ed9e134a5 Mon Sep 17 00:00:00 2001 From: "t-shunyi.kuang" <846002312@qq.com> Date: Tue, 28 Oct 2025 18:25:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xjrsoft/module/mdm/controller/ExpenseNameController.java | 2 +- .../com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java | 4 +++- .../module/mdm/service/impl/CountryRegionServiceImpl.java | 5 ++++- .../module/mdm/service/impl/ExpenseNameServiceImpl.java | 5 +++++ .../mdm/service/impl/PipeGasDownloadPointServiceImpl.java | 4 +++- .../module/mdm/service/impl/PipelineGgasLineServiceImpl.java | 4 +++- .../xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java | 5 +++++ 7 files changed, 24 insertions(+), 5 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java index 7ee4ece..72d9b5e 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/ExpenseNameController.java @@ -62,7 +62,7 @@ public class ExpenseNameController { .like(StrUtil.isNotBlank(dto.getValid()),LngBFee::getValid,dto.getValid()) .like(StrUtil.isNotBlank(dto.getCode()),LngBFee::getCode,dto.getCode()) .like(StrUtil.isNotBlank(dto.getNote()),LngBFee::getNote,dto.getNote()) - .orderByAsc(LngBFee::getCode,LngBFee::getCode) + .orderByAsc(LngBFee::getSort,LngBFee::getCode) .select(LngBFee.class,x -> VoToColumnUtil.fieldsToColumns(LngBFeePageVo.class).contains(x.getProperty())); IPage page = expenseNameService.page(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngBFeePageVo.class); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java index ae76bff..be572a2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java @@ -60,7 +60,8 @@ public class BankServiceImpl extends ServiceImpl imple return res.getId(); } - @Override + @Override + @Transactional(rollbackFor = Exception.class) public boolean enable(List ids) { DataLogTools.enable(UpdateLngBBankDto.class,ids); for (Long id : ids) { @@ -74,6 +75,7 @@ public class BankServiceImpl extends ServiceImpl imple @Override + @Transactional(rollbackFor = Exception.class) public boolean disable(List ids) { DataLogTools.disable(UpdateLngBBankDto.class,ids); 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 db41618..2c53742 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 @@ -57,7 +57,8 @@ public class CountryRegionServiceImpl extends ServiceImpl ids) { dataService.enable(UpdateLngBRegionDto.class,ids); for (Long id : ids) { @@ -71,6 +72,7 @@ public class CountryRegionServiceImpl extends ServiceImpl ids) { dataService.disable(UpdateLngBRegionDto.class,ids); for (Long id : ids) { @@ -85,6 +87,7 @@ public class CountryRegionServiceImpl extends ServiceImpl private final CommonCallService commonCallService; @Override + @Transactional(rollbackFor = Exception.class) public Long add(UpdateLngBFeeDto dto) { this.checkParams(dto); UpdateLngBFeeDto res = DataLogTools.insert(dto); @@ -43,6 +45,7 @@ public class ExpenseNameServiceImpl extends ServiceImpl } @Override + @Transactional(rollbackFor = Exception.class) public Long update(UpdateLngBFeeDto dto) { this.checkParams(dto); UpdateLngBFeeDto res = DataLogTools.update(dto); @@ -52,6 +55,7 @@ public class ExpenseNameServiceImpl extends ServiceImpl @Override + @Transactional(rollbackFor = Exception.class) public Boolean enable(List ids) { DataLogTools.enable(UpdateLngBBankDto.class,ids); for (Long id : ids) { @@ -64,6 +68,7 @@ public class ExpenseNameServiceImpl extends ServiceImpl } @Override + @Transactional(rollbackFor = Exception.class) public Boolean disable(List ids) { DataLogTools.disable(UpdateLngBBankDto.class,ids); for (Long id : ids) { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java index ee39667..f05d157 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java @@ -60,7 +60,8 @@ public class PipeGasDownloadPointServiceImpl extends ServiceImpl ids) { DataLogTools.enable(UpdateLngBStationPngDto.class,ids); for (Long id : ids) { @@ -74,6 +75,7 @@ public class PipeGasDownloadPointServiceImpl extends ServiceImpl ids) { DataLogTools.disable(UpdateLngBStationPngDto.class,ids); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java index fbc77d7..cfb03af 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java @@ -61,7 +61,8 @@ public class PipelineGgasLineServiceImpl extends ServiceImpl ids) { DataLogTools.enable(UpdateLngBPngLineDto.class,ids); for (Long id : ids) { @@ -82,6 +83,7 @@ public class PipelineGgasLineServiceImpl extends ServiceImpl ids) { DataLogTools.disable(UpdateLngBPngLineDto.class,ids); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java index 81ec99c..07f739d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/TaxRateServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -35,6 +36,7 @@ public class TaxRateServiceImpl extends ServiceImpl impl private final CommonCallService commonCallService; @Override + @Transactional(rollbackFor = Exception.class) public Long add(UpdateLngBTaxDto dto) { this.checkParams(dto); UpdateLngBTaxDto res = DataLogTools.insert(dto); @@ -43,6 +45,7 @@ public class TaxRateServiceImpl extends ServiceImpl impl } @Override + @Transactional(rollbackFor = Exception.class) public Long update(UpdateLngBTaxDto dto) { this.checkParams(dto); UpdateLngBTaxDto res = DataLogTools.update(dto); @@ -52,6 +55,7 @@ public class TaxRateServiceImpl extends ServiceImpl impl @Override + @Transactional(rollbackFor = Exception.class) public Boolean enable(List ids) { DataLogTools.enable(UpdateLngBTaxDto.class,ids); for (Long id : ids) { @@ -64,6 +68,7 @@ public class TaxRateServiceImpl extends ServiceImpl impl } @Override + @Transactional(rollbackFor = Exception.class) public Boolean disable(List ids) { DataLogTools.disable(UpdateLngBBankDto.class,ids); for (Long id : ids) {