Commit 00faa352f534771f8af0e7960a0e2abc19eb29a9

Authored by 王富生
1 parent 05df533d

app巡查汇总查询提交

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanPageReqVO.java
... ... @@ -28,6 +28,10 @@ public class InspectionPlanPageReqVO extends PageParam {
28 28 @Schema(description = "归属(一级部门id)", example = "20800")
29 29 private Long companyId;
30 30  
  31 + @Schema(description = "部门ID", example = "101")
  32 + private String deptId;
  33 +
  34 +
31 35 @Schema(description = "道路名称", example = "赵六")
32 36 private String roadName;
33 37  
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java
... ... @@ -85,8 +85,7 @@ public class RoadSaveReqVO {
85 85 private String endRemark;
86 86  
87 87 @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
88   - @NotEmpty(message = "备注不能为空")
89   - @Size(min=0, max = 500, message = "备注不能为空")
  88 + @Size(max = 500, message = "备注最大500字符")
90 89 private String remark;
91 90  
92 91 @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2323")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadUpdateReqVO.java
... ... @@ -89,8 +89,7 @@ public class RoadUpdateReqVO {
89 89 private String endRemark;
90 90  
91 91 @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
92   - @NotEmpty(message = "备注不能为空")
93   - @Size(max = 500, message = "备注不能为空")
  92 + @Size(max = 500, message = "备注最大500")
94 93 private String remark;
95 94  
96 95 @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2323")
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java
... ... @@ -23,6 +23,7 @@ public interface InspectionPlanInterceptMapper extends BaseMapperX<InspectionPla
23 23 .likeIfPresent(InspectionPlanDO::getPlanName, reqVO.getPlanName())
24 24 .eqIfPresent(InspectionPlanDO::getPlanAttr, reqVO.getPlanAttr())
25 25 .eqIfPresent(InspectionPlanDO::getPlanTypeId, reqVO.getPlanTypeId())
  26 + .eqIfPresent(InspectionPlanDO::getDeptId, reqVO.getDeptId())
26 27 .eqIfPresent(InspectionPlanDO::getCompanyId, reqVO.getCompanyId())
27 28 .likeIfPresent(InspectionPlanDO::getRoadName, reqVO.getRoadName())
28 29 .eqIfPresent(InspectionPlanDO::getLevelId, reqVO.getLevelId())
... ...