|
|
@ -42,10 +42,11 @@ public class OperMaintenanceMonitorServiceImpl implements IOperMaintenanceMonito |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public R<Map<String, List<OperMaintenancePlanVO>>> reportMonth(OperMaintenanceMonitorReportMonthDTO req) { |
|
|
|
public R<Map<String, List<OperMaintenancePlanVO>>> reportMonth(OperMaintenanceMonitorReportMonthDTO req) { |
|
|
|
List<OperMaintenancePlanEntity> planEntities = planMapper.selectList(new LambdaQueryWrapper<OperMaintenancePlanEntity>() {{ |
|
|
|
List<OperMaintenancePlanEntity> planEntities = planMapper.selectList(new LambdaQueryWrapper<OperMaintenancePlanEntity>() {{ |
|
|
|
Date startTime = DateUtil.parse(DateUtil.format(DateUtil.now(), "yyyy-MM") + "-01", DateUtil.PATTERN_DATE); |
|
|
|
LocalDate startDate = LocalDate.of(req.getYear(), req.getMonth(),1); |
|
|
|
|
|
|
|
// Date startTime = DateUtil.parse(DateUtil.format(DateUtil.now(), "yyyy-MM") + "-01", DateUtil.PATTERN_DATE);
|
|
|
|
eq(OperMaintenancePlanEntity::getIsDeleted, 0L); |
|
|
|
eq(OperMaintenancePlanEntity::getIsDeleted, 0L); |
|
|
|
ge(OperMaintenancePlanEntity::getDisposeTime, startTime); |
|
|
|
ge(OperMaintenancePlanEntity::getDisposeTime, startDate); |
|
|
|
lt(OperMaintenancePlanEntity::getDisposeTime, DateUtil.plusMonths(startTime, 1)); |
|
|
|
lt(OperMaintenancePlanEntity::getDisposeTime, startDate.withDayOfMonth(startDate.getMonth().maxLength())); |
|
|
|
}}); |
|
|
|
}}); |
|
|
|
|
|
|
|
|
|
|
|
//获取列表班次ID集合
|
|
|
|
//获取列表班次ID集合
|
|
|
|