Commit ad2389a4351bb2ced888e36049e04e981540caed

Authored by 王富生
1 parent 6a6f391d

增加查询条件

urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java
@@ -33,6 +33,9 @@ public class MaintainPlanPageReqVO extends PageParam { @@ -33,6 +33,9 @@ public class MaintainPlanPageReqVO extends PageParam {
33 @Schema(description = "归属(一级部门id)", example = "1713") 33 @Schema(description = "归属(一级部门id)", example = "1713")
34 private Long companyId; 34 private Long companyId;
35 35
  36 + @Schema(description = "部门id")
  37 + private Integer deptId;
  38 +
36 @Schema(description = "道路名称", example = "王五") 39 @Schema(description = "道路名称", example = "王五")
37 private String roadName; 40 private String roadName;
38 41
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanInterceptMapper.java
@@ -28,6 +28,8 @@ public interface MaintainPlanInterceptMapper extends BaseMapperX<MaintainPlanDO> @@ -28,6 +28,8 @@ public interface MaintainPlanInterceptMapper extends BaseMapperX<MaintainPlanDO>
28 .likeIfPresent(MaintainPlanDO::getRoadName, reqVO.getRoadName()) 28 .likeIfPresent(MaintainPlanDO::getRoadName, reqVO.getRoadName())
29 .eqIfPresent(MaintainPlanDO::getFinishState, reqVO.getFinishState()) 29 .eqIfPresent(MaintainPlanDO::getFinishState, reqVO.getFinishState())
30 .eqIfPresent(MaintainPlanDO::getLevelId, reqVO.getLevelId()) 30 .eqIfPresent(MaintainPlanDO::getLevelId, reqVO.getLevelId())
  31 + .eqIfPresent(MaintainPlanDO::getCycleId, reqVO.getCycleId())
  32 + .eqIfPresent(MaintainPlanDO::getDeptId, reqVO.getDeptId())
31 .betweenIfPresent(MaintainPlanDO::getBeginTime, reqVO.getBeginTime()) 33 .betweenIfPresent(MaintainPlanDO::getBeginTime, reqVO.getBeginTime())
32 .betweenIfPresent(MaintainPlanDO::getEndTime, reqVO.getEndTime()) 34 .betweenIfPresent(MaintainPlanDO::getEndTime, reqVO.getEndTime())
33 .eq(MaintainPlanDO::getDeleted,0) 35 .eq(MaintainPlanDO::getDeleted,0)