|
@ -19,6 +19,8 @@ import java.util.List; |
|
|
import java.util.Optional; |
|
|
import java.util.Optional; |
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
|
|
import static com.kms.yxgh.common.enums.DfYhV2StatusEnum.DURING_INSPECTION; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 项目管理记录 |
|
|
* 项目管理记录 |
|
|
* |
|
|
* |
|
@ -59,11 +61,9 @@ public class DfCheckingProblemV2Service extends BaseService<DfCheckingProblemV2M |
|
|
.ifPresent(status -> queryWrapper.like(DfCheckingProblemV2::getStatus, status)); |
|
|
.ifPresent(status -> queryWrapper.like(DfCheckingProblemV2::getStatus, status)); |
|
|
|
|
|
|
|
|
Optional.ofNullable(data.getStartDate()) |
|
|
Optional.ofNullable(data.getStartDate()) |
|
|
.filter(startDate -> startDate != null) |
|
|
|
|
|
.ifPresent(startDate -> queryWrapper.ge(DfCheckingProblemV2::getStartDate, startDate)); |
|
|
.ifPresent(startDate -> queryWrapper.ge(DfCheckingProblemV2::getStartDate, startDate)); |
|
|
|
|
|
|
|
|
Optional.ofNullable(data.getEndDate()) |
|
|
Optional.ofNullable(data.getEndDate()) |
|
|
.filter(endDate -> endDate != null) |
|
|
|
|
|
.ifPresent(endDate -> queryWrapper.le(DfCheckingProblemV2::getEndDate, endDate)); |
|
|
.ifPresent(endDate -> queryWrapper.le(DfCheckingProblemV2::getEndDate, endDate)); |
|
|
|
|
|
|
|
|
Optional.ofNullable(data.getProblemLevel()) |
|
|
Optional.ofNullable(data.getProblemLevel()) |
|
@ -75,6 +75,7 @@ public class DfCheckingProblemV2Service extends BaseService<DfCheckingProblemV2M |
|
|
.ifPresent(recordId -> queryWrapper.eq(DfCheckingProblemV2::getProblemLevel, recordId)); |
|
|
.ifPresent(recordId -> queryWrapper.eq(DfCheckingProblemV2::getProblemLevel, recordId)); |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); |
|
|
|
|
|
|
|
|
// 查询分页数据
|
|
|
// 查询分页数据
|
|
|
Page<DfCheckingProblemV2> queryPage = page(page, queryWrapper); |
|
|
Page<DfCheckingProblemV2> queryPage = page(page, queryWrapper); |
|
|