增加查询条件

王富生
1 parent ad2389a4
Showing 7 changed files with 41 additions and 33 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java
 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("备注")
@@ -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;
 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
 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;
     /**
      * 备注
      */
@@ -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<InspectionPlanDetailDO> 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);
     }
  
@@ -415,9 +415,9 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     @Override
     public void updateExpiredInspectionPlans() {
         // 更新过期的计划状态为过期(3)
-        LocalDateTime now = LocalDateTime.now();
+        LocalDate yesterday = LocalDate.now(); // 昨天日期
         LambdaUpdateWrapper<InspectionPlanDO> 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);
@@ -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<MaintainPlanDetailDO> 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<MaintainPlanDO> 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);
     }
  
 }