Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/BankController.java

@@ -65,14 +65,19 @@ public class BankController {
 
         LambdaQueryWrapper<LngBBank> 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())
-                    .orderByDesc(LngBBank::getCode)
+                    .orderByAsc(LngBBank::getSort,LngBBank::getCode)
                 .select(LngBBank.class,x -> VoToColumnUtil.fieldsToColumns(LngBBankPageVo.class).contains(x.getProperty()));
         IPage<LngBBank> page = bankService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LngBBankPageVo> pageOutput = ConventPage.getPageOutput(page, LngBBankPageVo.class);

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<LngBRegion> page = countryRegionService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LngBRegionPageVo> pageOutput = ConventPage.getPageOutput(page, LngBRegionPageVo.class);

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::getSort,LngBFee::getCode)
                 .select(LngBFee.class,x -> VoToColumnUtil.fieldsToColumns(LngBFeePageVo.class).contains(x.getProperty()));
         IPage<LngBFee> page = expenseNameService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LngBFeePageVo> pageOutput = ConventPage.getPageOutput(page, LngBFeePageVo.class);

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<LngBStationPng> page = pipeGasDownloadPointService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LngBStationPngPageVo> pageOutput = ConventPage.getPageOutput(page, LngBStationPngPageVo.class);

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<LngBPngLine> page = pipelineGgasLineService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LngBPngLinePageVo> pageOutput = ConventPage.getPageOutput(page, LngBPngLinePageVo.class);

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<LngBTax> page = taxRateService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<LngBTaxPageVo> pageOutput = ConventPage.getPageOutput(page, LngBTaxPageVo.class);

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/BankServiceImpl.java

@@ -61,6 +61,7 @@ public class BankServiceImpl extends ServiceImpl<LngBBankMapper, LngBBank> imple
     }
     
 	@Override
+	@Transactional(rollbackFor = Exception.class)
     public boolean enable(List<Long> ids) {
 		DataLogTools.enable(UpdateLngBBankDto.class,ids);
 		for (Long id : ids) {
@@ -74,6 +75,7 @@ public class BankServiceImpl extends ServiceImpl<LngBBankMapper, LngBBank> imple
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean disable(List<Long> ids) {
     	    DataLogTools.disable(UpdateLngBBankDto.class,ids);
     	  

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/CountryRegionServiceImpl.java

@@ -58,6 +58,7 @@ public class CountryRegionServiceImpl extends ServiceImpl<LngBRegionMapper, LngB
     }
     
 	@Override
+	@Transactional(rollbackFor = Exception.class)
     public boolean enable(List<Long> ids) {
 		dataService.enable(UpdateLngBRegionDto.class,ids);
 		for (Long id : ids) {
@@ -71,6 +72,7 @@ public class CountryRegionServiceImpl extends ServiceImpl<LngBRegionMapper, LngB
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean disable(List<Long> ids) {
       	dataService.disable(UpdateLngBRegionDto.class,ids);
       	for (Long id : ids) {
@@ -85,6 +87,7 @@ public class CountryRegionServiceImpl extends ServiceImpl<LngBRegionMapper, LngB
  
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Long update(UpdateLngBRegionDto dto) {
 		if(!CountryRegionEnum.CONTINENT.getCode().equals(dto.getRegionTypeCode()) ) {
 	    	   if(dto.getPid() != null && dto.getPid() != 0) {

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/ExpenseNameServiceImpl.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 ExpenseNameServiceImpl extends ServiceImpl<LngBFeeMapper, LngBFee>
 	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<LngBFeeMapper, LngBFee>
 	}
 	
 	@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<LngBFeeMapper, LngBFee>
 	
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Boolean enable(List<Long> ids) {
 		DataLogTools.enable(UpdateLngBBankDto.class,ids);
 		for (Long id : ids) {
@@ -64,6 +68,7 @@ public class ExpenseNameServiceImpl extends ServiceImpl<LngBFeeMapper, LngBFee>
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Boolean disable(List<Long> ids) {
 		DataLogTools.disable(UpdateLngBBankDto.class,ids);
 		for (Long id : ids) {

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipeGasDownloadPointServiceImpl.java

@@ -61,6 +61,7 @@ public class PipeGasDownloadPointServiceImpl extends ServiceImpl<LngBStationPngM
 	}
 	
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Boolean enable(List<Long> ids) {
 		DataLogTools.enable(UpdateLngBStationPngDto.class,ids);
 		for (Long id : ids) {
@@ -74,6 +75,7 @@ public class PipeGasDownloadPointServiceImpl extends ServiceImpl<LngBStationPngM
 	
 	
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Boolean disable(List<Long> ids) {
 	    DataLogTools.disable(UpdateLngBStationPngDto.class,ids);
 	  

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/service/impl/PipelineGgasLineServiceImpl.java

@@ -62,6 +62,7 @@ public class PipelineGgasLineServiceImpl extends ServiceImpl<LngBPngLineMapper,
 	}
 	
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Boolean enable(List<Long> ids) {
 		DataLogTools.enable(UpdateLngBPngLineDto.class,ids);
 		for (Long id : ids) {
@@ -82,6 +83,7 @@ public class PipelineGgasLineServiceImpl extends ServiceImpl<LngBPngLineMapper,
 	
 	
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Boolean disable(List<Long> ids) {
 	    DataLogTools.disable(UpdateLngBPngLineDto.class,ids);
 	  

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<LngBTaxMapper, LngBTax> 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<LngBTaxMapper, LngBTax> 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<LngBTaxMapper, LngBTax> impl
 	
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Boolean enable(List<Long> ids) {
 		DataLogTools.enable(UpdateLngBTaxDto.class,ids);
 		for (Long id : ids) {
@@ -64,6 +68,7 @@ public class TaxRateServiceImpl extends ServiceImpl<LngBTaxMapper, LngBTax> impl
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Boolean disable(List<Long> ids) {
 		DataLogTools.disable(UpdateLngBBankDto.class,ids);
 		for (Long id : ids) {