From 50b6254e62a3a874f5de9fd69661cb72f5999799 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Tue, 16 Dec 2025 23:14:04 +0800 Subject: [PATCH] 增加查询条件 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java | 12 +++++++----- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanRespVO.java | 6 +++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java | 6 +++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java | 13 ++++++++----- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java | 12 ++++++------ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java | 4 ++-- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java | 21 ++++++++++++--------- 7 files changed, 41 insertions(+), 33 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java index c2009a2..cc29d68 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java @@ -1,13 +1,15 @@ package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo; +import cn.idev.excel.annotation.ExcelIgnoreUnannotated; +import cn.idev.excel.annotation.ExcelProperty; import com.fhs.core.trans.vo.VO; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; +import lombok.Data; + +import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; -import cn.idev.excel.annotation.*; - @Schema(description = "管理后台 - 巡检计划汇总 Response VO") @Data @ExcelIgnoreUnannotated @@ -86,11 +88,11 @@ public class InspectionPlanRespVO implements VO { @Schema(description = "开始时间") @ExcelProperty("开始时间") - private LocalDateTime beginTime; + private LocalDate beginTime; @Schema(description = "开始时间") @ExcelProperty("开始时间") - private LocalDateTime endTime; + private LocalDate endTime; @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对") @ExcelProperty("备注") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanRespVO.java index fe5a461..1be1bc9 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanRespVO.java @@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; +import java.time.LocalDate; import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; @@ -37,11 +37,11 @@ public class AppInspectionPlanRespVO { @Schema(description = "执行开始时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDateTime beginTime; + private LocalDate beginTime; @Schema(description = "执行时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDateTime endTime; + private LocalDate endTime; @Schema(description = "完成状态 1:未完成;2:进行中;3:已完成", requiredMode = Schema.RequiredMode.REQUIRED) private Integer finishState; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java index 58bf1ab..1081a43 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java @@ -1,7 +1,6 @@ package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo; import cn.idev.excel.annotation.ExcelProperty; -import com.zteits.urbanops.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; @@ -9,6 +8,7 @@ import jakarta.validation.constraints.NotNull; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDate; import java.time.LocalDateTime; import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; @@ -52,10 +52,10 @@ public class AppMaintainPlanPageRoadRespVO{ @Schema(description = "执行开始时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDateTime beginTime; + private LocalDate beginTime; @Schema(description = "执行时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) - private LocalDateTime endTime; + private LocalDate endTime; } \ No newline at end of file diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java index 68f0ddb..79b7ab9 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java @@ -1,9 +1,12 @@ package com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan; -import lombok.*; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO; +import lombok.*; + +import java.time.LocalDate; /** * 巡检计划汇总 DO @@ -89,11 +92,11 @@ public class InspectionPlanDO extends BaseDO { /** * 开始时间 */ - private LocalDateTime beginTime; + private LocalDate beginTime; /** * 开始时间 */ - private LocalDateTime endTime; + private LocalDate endTime; /** * 备注 */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java index 38aa762..b261556 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java @@ -9,8 +9,6 @@ import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.Insp import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailReqVO; import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailRespVO; import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO; -import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO; -import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO; import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper; import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanRoleMapper; import com.zteits.urbanops.module.garden.enums.FinishStateEnum; @@ -20,7 +18,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.Arrays; import java.util.List; @@ -109,11 +109,11 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ @Override public void updateExpiredInspectionPlanDetails() { // 更新过期的计划明细状态为过期(3) - LocalDateTime now = LocalDateTime.now(); + LocalDateTime localDateTime = LocalDate.now().atStartOfDay(); //00:00:00 LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.lt(InspectionPlanDetailDO::getEndTime, now) - .ne(InspectionPlanDetailDO::getFinishState, FinishStateEnum.FINISHED.getStatus()) // 排除已完成的 - .set(InspectionPlanDetailDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()); // 设置为过期状态 + updateWrapper.lt(InspectionPlanDetailDO::getEndTime, localDateTime) + .set(InspectionPlanDetailDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()) // 设置为过期状态 + .eq(InspectionPlanDetailDO::getFinishState, FinishStateEnum.NOT_FINISHED.getStatus()); inspectionPlanDetailMapper.update(null, updateWrapper); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java index 7d57958..3238650 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java @@ -415,9 +415,9 @@ public class InspectionPlanServiceImpl implements InspectionPlanService { @Override public void updateExpiredInspectionPlans() { // 更新过期的计划状态为过期(3) - LocalDateTime now = LocalDateTime.now(); + LocalDate yesterday = LocalDate.now(); // 昨天日期 LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.lt(InspectionPlanDO::getEndTime, now) + updateWrapper.lt(InspectionPlanDO::getEndTime, yesterday) .ne(InspectionPlanDO::getFinishState, FinishStateEnum.FINISHED.getStatus()) // 排除已完成的 .set(InspectionPlanDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()); // 设置为过期状态 inspectionPlanMapper.update(null, updateWrapper); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java index 6ddee61..59fa58a 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java @@ -27,7 +27,9 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -157,23 +159,24 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService @Override public void updateExpiredMaintainPlanDetails() { // 更新过期的计划明细状态为过期(3) - LocalDateTime now = LocalDateTime.now(); + LocalDateTime localDateTime = LocalDate.now().atStartOfDay(); //00:00:00 LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.lt(MaintainPlanDetailDO::getEndTime, now) - .ne(MaintainPlanDetailDO::getFinishState, FinishStateEnum.FINISHED.getStatus()) // 排除已完成的 - .set(MaintainPlanDetailDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()); // 设置为过期状态 - maintainPlanDetailMapper.update(null, updateWrapper); + updateWrapper.lt(MaintainPlanDetailDO::getEndTime, localDateTime) + .set(MaintainPlanDetailDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()) // 设置为过期状态 + .eq(MaintainPlanDetailDO::getFinishState, FinishStateEnum.NOT_FINISHED.getStatus()); + + maintainPlanDetailMapper.update(updateWrapper); } @Override public void updateExpiredMaintainPlans() { // 更新过期的计划状态为过期(3) - LocalDateTime now = LocalDateTime.now(); + LocalDate now = LocalDate.now(); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.lt(MaintainPlanDO::getEndTime, now) - .ne(MaintainPlanDO::getFinishState, FinishStateEnum.FINISHED.getStatus()) // 排除已完成的 - .set(MaintainPlanDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()); // 设置为过期状态 - maintainPlanMapper.update(null, updateWrapper); + .set(MaintainPlanDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()) // 设置为过期状态 + .eq(MaintainPlanDO::getFinishState, FinishStateEnum.NOT_FINISHED.getStatus()); + maintainPlanMapper.update(updateWrapper); } } -- libgit2 0.21.4