|
|
@ -57,7 +57,8 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> { |
|
|
|
.eq(StringUtils.isNotBlank(searchDto.getDikeType()), DfRecord::getDikeType, searchDto.getDikeType()) |
|
|
|
.like(StringUtils.isNotBlank(searchDto.getLineName()), DfRecord::getLineName, searchDto.getLineName()) |
|
|
|
.eq(StringUtils.isNotBlank(searchDto.getLineType()), DfRecord::getLineType, searchDto.getLineType()) |
|
|
|
.eq(StringUtils.isNotBlank(searchDto.getDutyHolderType()), DfRecord::getDutyHolderType, searchDto.getDutyHolderType()); |
|
|
|
.eq(StringUtils.isNotBlank(searchDto.getDutyHolderType()), DfRecord::getDutyHolderType, searchDto.getDutyHolderType()) |
|
|
|
.orderByDesc(DfRecord::getEndDate); |
|
|
|
page = page(page, wp); |
|
|
|
if (CollectionUtil.isNotEmpty(page.getRecords())) { |
|
|
|
|
|
|
|