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);