app巡查汇总查询提交

王富生
1 parent 05df533d
Showing 4 changed files with 7 additions and 4 deletions
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/road/vo/RoadSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadUpdateReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanInterceptMapper.java
@@ -28,6 +28,10 @@ public class InspectionPlanPageReqVO extends PageParam {
     @Schema(description = "归属(一级部门id)", example = "20800")
     private Long companyId;
+    @Schema(description = "部门ID", example = "101")
+    private String deptId;
+
+
     @Schema(description = "道路名称", example = "赵六")
     private String roadName;
@@ -85,8 +85,7 @@ public class RoadSaveReqVO {
     private String endRemark;
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
-    @NotEmpty(message = "备注不能为空")
-    @Size(min=0, max = 500, message = "备注不能为空")
+    @Size(max = 500, message = "备注最大500字符")
     private String remark;
     @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2323")
@@ -89,8 +89,7 @@ public class RoadUpdateReqVO {
     private String endRemark;
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
-    @NotEmpty(message = "备注不能为空")
-    @Size(max = 500, message = "备注不能为空")
+    @Size(max = 500, message = "备注最大500")
     private String remark;
     @Schema(description = "归属(一级部门id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2323")
@@ -23,6 +23,7 @@ public interface InspectionPlanInterceptMapper extends BaseMapperX&lt;InspectionPla
                 .likeIfPresent(InspectionPlanDO::getPlanName, reqVO.getPlanName())
                 .eqIfPresent(InspectionPlanDO::getPlanAttr, reqVO.getPlanAttr())
                 .eqIfPresent(InspectionPlanDO::getPlanTypeId, reqVO.getPlanTypeId())
+                .eqIfPresent(InspectionPlanDO::getDeptId, reqVO.getDeptId())
                 .eqIfPresent(InspectionPlanDO::getCompanyId, reqVO.getCompanyId())
                 .likeIfPresent(InspectionPlanDO::getRoadName, reqVO.getRoadName())
                 .eqIfPresent(InspectionPlanDO::getLevelId, reqVO.getLevelId())