巡查计划-创建提交

王富生
1 parent c1940c33
Showing 4 changed files with 2 additions and 39 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanDetailPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanMapper.java
 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.*;
 import java.time.LocalDate;
@@ -16,6 +17,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE
 public class InspectionPlanDetailPageReqVO extends PageParam {
     @Schema(description = "批次号")
+    @NotEmpty(message = "批次号不能为空")
     private String batchNo;
     @Schema(description = "计划编码")
@@ -18,8 +18,6 @@ public class InspectionPlanPageReqVO extends PageParam {
     @Schema(description = "计划名称", example = "张三")
     private String planName;
-    @Schema(description = "业务线: yl-园林；wy-物业：sz-市政")
-    private String busiLine;
     @Schema(description = "计划属性:1:标准计划；2:临时计划")
     private Integer planAttr;
@@ -30,29 +28,12 @@ public class InspectionPlanPageReqVO extends PageParam {
     @Schema(description = "归属(一级部门id)", example = "20800")
     private Long companyId;
-    @Schema(description = "部门ID(道路负责部门id)", example = "16445")
-    private Long deptId;
-
-    @Schema(description = "道路ID", example = "15557")
-    private Long roadId;
-
     @Schema(description = "道路名称", example = "赵六")
     private String roadName;
     @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", example = "8588")
     private Integer levelId;
-    @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", example = "6415")
-    private Integer cycleId;
-
-    @Schema(description = "计划次数")
-    private Integer planNum;
-
-    @Schema(description = "已完成次数")
-    private Integer planFinishNum;
-
-    @Schema(description = "完成状态 1:未完成;2:已完成")
-    private Integer finishState;
     @Schema(description = "开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
@@ -62,11 +43,4 @@ public class InspectionPlanPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] endTime;
-    @Schema(description = "备注", example = "你说的对")
-    private String remark;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
 }
 \ No newline at end of file
@@ -66,8 +66,4 @@ public class InspectionPlanSaveReqVO {
     @Size(min = 1)
     private Set<Long> roleIds;
-    public boolean verify() {
-
-    }
-
 }
 \ No newline at end of file
@@ -20,22 +20,13 @@ public interface InspectionPlanMapper extends BaseMapperX&lt;InspectionPlanDO&gt; {
         return selectPage(reqVO, new LambdaQueryWrapperX<InspectionPlanDO>()
                 .eqIfPresent(InspectionPlanDO::getBatchNo, reqVO.getBatchNo())
                 .likeIfPresent(InspectionPlanDO::getPlanName, reqVO.getPlanName())
-                .eqIfPresent(InspectionPlanDO::getBusiLine, reqVO.getBusiLine())
                 .eqIfPresent(InspectionPlanDO::getPlanAttr, reqVO.getPlanAttr())
                 .eqIfPresent(InspectionPlanDO::getPlanTypeId, reqVO.getPlanTypeId())
                 .eqIfPresent(InspectionPlanDO::getCompanyId, reqVO.getCompanyId())
-                .eqIfPresent(InspectionPlanDO::getDeptId, reqVO.getDeptId())
-                .eqIfPresent(InspectionPlanDO::getRoadId, reqVO.getRoadId())
                 .likeIfPresent(InspectionPlanDO::getRoadName, reqVO.getRoadName())
                 .eqIfPresent(InspectionPlanDO::getLevelId, reqVO.getLevelId())
-                .eqIfPresent(InspectionPlanDO::getCycleId, reqVO.getCycleId())
-                .eqIfPresent(InspectionPlanDO::getPlanNum, reqVO.getPlanNum())
-                .eqIfPresent(InspectionPlanDO::getPlanFinishNum, reqVO.getPlanFinishNum())
-                .eqIfPresent(InspectionPlanDO::getFinishState, reqVO.getFinishState())
                 .betweenIfPresent(InspectionPlanDO::getBeginTime, reqVO.getBeginTime())
                 .betweenIfPresent(InspectionPlanDO::getEndTime, reqVO.getEndTime())
-                .eqIfPresent(InspectionPlanDO::getRemark, reqVO.getRemark())
-                .betweenIfPresent(InspectionPlanDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(InspectionPlanDO::getId));
     }