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 f463fdf..6d10ac5 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,6 @@ 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()) - .like(StrUtil.isNotBlank(dto.getNote()),LngBRegion::getNote,dto.getNote()) .orderByDesc(LngBRegion::getCode) .select(LngBRegion.class,x -> VoToColumnUtil.fieldsToColumns(LngBRegionPageVo.class).contains(x.getProperty())); IPage page = countryRegionService.page(ConventPage.getPage(dto), queryWrapper); 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 e7682a9..969fb3e 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 @@ -63,7 +63,7 @@ public class ExpenseNameController { .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::getId) + .orderByDesc(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 bf4df19..805a53b 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 @@ -62,19 +62,14 @@ public class PipeGasDownloadPointController { .like(StrUtil.isNotBlank(dto.getFullName()),LngBStationPng::getFullName,dto.getFullName()) .like(StrUtil.isNotBlank(dto.getPipelineCode()),LngBStationPng::getPipelineCode,dto.getPipelineCode()) .like(StrUtil.isNotBlank(dto.getEnterprise()),LngBStationPng::getEnterprise,dto.getEnterprise()) - .like(StrUtil.isNotBlank(dto.getContact()),LngBStationPng::getContact,dto.getContact()) - .like(StrUtil.isNotBlank(dto.getTel()),LngBStationPng::getTel,dto.getTel()) - .like(StrUtil.isNotBlank(dto.getEmail()),LngBStationPng::getEmail,dto.getEmail()) .like(StrUtil.isNotBlank(dto.getRegionCode()),LngBStationPng::getRegionCode,dto.getRegionCode()) - .like(StrUtil.isNotBlank(dto.getAddr()),LngBStationPng::getAddr,dto.getAddr()) - .like(StrUtil.isNotBlank(dto.getAddrMail()),LngBStationPng::getAddrMail,dto.getAddrMail()) .like(StrUtil.isNotBlank(dto.getOwnSign()),LngBStationPng::getOwnSign,dto.getOwnSign()) .like(StrUtil.isNotBlank(dto.getStaCodeLng()),LngBStationPng::getStaCodeLng,dto.getStaCodeLng()) .like(StrUtil.isNotBlank(dto.getOwnLineSign()),LngBStationPng::getOwnLineSign,dto.getOwnLineSign()) //.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::getId) + .orderByDesc(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 80dc795..f033342 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::getId) + .orderByDesc(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 fba230c..b9196b1 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 @@ -63,7 +63,7 @@ public class TaxRateController { .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::getId) + .orderByDesc(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);