修改排序
This commit is contained in:
@ -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<LngBRegion> page = countryRegionService.page(ConventPage.getPage(dto), queryWrapper);
|
||||
|
||||
@ -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<LngBFee> page = expenseNameService.page(ConventPage.getPage(dto), queryWrapper);
|
||||
PageOutput<LngBFeePageVo> pageOutput = ConventPage.getPageOutput(page, LngBFeePageVo.class);
|
||||
|
||||
@ -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<LngBStationPng> page = pipeGasDownloadPointService.page(ConventPage.getPage(dto), queryWrapper);
|
||||
PageOutput<LngBStationPngPageVo> pageOutput = ConventPage.getPageOutput(page, LngBStationPngPageVo.class);
|
||||
|
||||
@ -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<LngBPngLine> page = pipelineGgasLineService.page(ConventPage.getPage(dto), queryWrapper);
|
||||
PageOutput<LngBPngLinePageVo> pageOutput = ConventPage.getPageOutput(page, LngBPngLinePageVo.class);
|
||||
|
||||
@ -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<LngBTax> page = taxRateService.page(ConventPage.getPage(dto), queryWrapper);
|
||||
PageOutput<LngBTaxPageVo> pageOutput = ConventPage.getPageOutput(page, LngBTaxPageVo.class);
|
||||
|
||||
Reference in New Issue
Block a user