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] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8B=E5=8A=A1=E6=B3=A8?= =?UTF-8?q?=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) {