BJ_FS / urbanops

Commit 69603c7f62137a0e447231993f4402ae028a1dfc

Authored by 王富生
1 parent c1940c33

巡查计划-创建提交

Inline Side-by-side
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
  View file @69603c7
1 1 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo;
2 2  
  3 +import jakarta.validation.constraints.NotEmpty;
3 4 import lombok.*;
4 5  
5 6 import java.time.LocalDate;
... ... @@ -16,6 +17,7 @@ import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YE
16 17 public class InspectionPlanDetailPageReqVO extends PageParam {
17 18  
18 19 @Schema(description = "批次号")
  20 + @NotEmpty(message = "批次号不能为空")
19 21 private String batchNo;
20 22  
21 23 @Schema(description = "计划编码")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java
  View file @69603c7
... ... @@ -18,8 +18,6 @@ public class InspectionPlanPageReqVO extends PageParam {
18 18 @Schema(description = "计划名称", example = "张三")
19 19 private String planName;
20 20  
21   - @Schema(description = "业务线: yl-园林；wy-物业：sz-市政")
22   - private String busiLine;
23 21  
24 22 @Schema(description = "计划属性:1:标准计划；2:临时计划")
25 23 private Integer planAttr;
... ... @@ -30,29 +28,12 @@ public class InspectionPlanPageReqVO extends PageParam {
30 28 @Schema(description = "归属(一级部门id)", example = "20800")
31 29 private Long companyId;
32 30  
33   - @Schema(description = "部门ID(道路负责部门id)", example = "16445")
34   - private Long deptId;
35   -
36   - @Schema(description = "道路ID", example = "15557")
37   - private Long roadId;
38   -
39 31 @Schema(description = "道路名称", example = "赵六")
40 32 private String roadName;
41 33  
42 34 @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", example = "8588")
43 35 private Integer levelId;
44 36  
45   - @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次", example = "6415")
46   - private Integer cycleId;
47   -
48   - @Schema(description = "计划次数")
49   - private Integer planNum;
50   -
51   - @Schema(description = "已完成次数")
52   - private Integer planFinishNum;
53   -
54   - @Schema(description = "完成状态 1:未完成;2:已完成")
55   - private Integer finishState;
56 37  
57 38 @Schema(description = "开始时间")
58 39 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
... ... @@ -62,11 +43,4 @@ public class InspectionPlanPageReqVO extends PageParam {
62 43 @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
63 44 private LocalDateTime[] endTime;
64 45  
65   - @Schema(description = "备注", example = "你说的对")
66   - private String remark;
67   -
68   - @Schema(description = "创建时间")
69   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
70   - private LocalDateTime[] createTime;
71   -
72 46 }
73 47 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java
  View file @69603c7
... ... @@ -66,8 +66,4 @@ public class InspectionPlanSaveReqVO {
66 66 @Size(min = 1)
67 67 private Set<Long> roleIds;
68 68  
69   - public boolean verify() {
70   -
71   - }
72   -
73 69 }
74 70 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanMapper.java
  View file @69603c7
... ... @@ -20,22 +20,13 @@ public interface InspectionPlanMapper extends BaseMapperX&lt;InspectionPlanDO&gt; {
20 20 return selectPage(reqVO, new LambdaQueryWrapperX<InspectionPlanDO>()
21 21 .eqIfPresent(InspectionPlanDO::getBatchNo, reqVO.getBatchNo())
22 22 .likeIfPresent(InspectionPlanDO::getPlanName, reqVO.getPlanName())
23   - .eqIfPresent(InspectionPlanDO::getBusiLine, reqVO.getBusiLine())
24 23 .eqIfPresent(InspectionPlanDO::getPlanAttr, reqVO.getPlanAttr())
25 24 .eqIfPresent(InspectionPlanDO::getPlanTypeId, reqVO.getPlanTypeId())
26 25 .eqIfPresent(InspectionPlanDO::getCompanyId, reqVO.getCompanyId())
27   - .eqIfPresent(InspectionPlanDO::getDeptId, reqVO.getDeptId())
28   - .eqIfPresent(InspectionPlanDO::getRoadId, reqVO.getRoadId())
29 26 .likeIfPresent(InspectionPlanDO::getRoadName, reqVO.getRoadName())
30 27 .eqIfPresent(InspectionPlanDO::getLevelId, reqVO.getLevelId())
31   - .eqIfPresent(InspectionPlanDO::getCycleId, reqVO.getCycleId())
32   - .eqIfPresent(InspectionPlanDO::getPlanNum, reqVO.getPlanNum())
33   - .eqIfPresent(InspectionPlanDO::getPlanFinishNum, reqVO.getPlanFinishNum())
34   - .eqIfPresent(InspectionPlanDO::getFinishState, reqVO.getFinishState())
35 28 .betweenIfPresent(InspectionPlanDO::getBeginTime, reqVO.getBeginTime())
36 29 .betweenIfPresent(InspectionPlanDO::getEndTime, reqVO.getEndTime())
37   - .eqIfPresent(InspectionPlanDO::getRemark, reqVO.getRemark())
38   - .betweenIfPresent(InspectionPlanDO::getCreateTime, reqVO.getCreateTime())
39 30 .orderByDesc(InspectionPlanDO::getId));
40 31 }
41 32  
... ...