From e884db38b963502f7129ef8fbb8de237b3b25924 Mon Sep 17 00:00:00 2001 From: wangfs <15029758498@163.com> Date: Thu, 18 Dec 2025 23:24:46 +0800 Subject: [PATCH] 养护计划优化提交 --- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java | 8 ++++---- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadRespVO.java | 8 ++++---- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java | 28 ++++++++++++++++------------ urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java | 8 +++++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadDO.java | 8 ++++---- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java | 6 +++--- urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml | 7 ++----- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java index 4cf921c..62270bb 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java @@ -35,16 +35,16 @@ public class RoadPageReqVO extends PageParam { private String direction; @Schema(description = "行道树绿化面积") - private String greenBeltTreeArea; + private Float greenBeltTreeArea; @Schema(description = "绿化带面积") - private String greenBeltArea; + private Float greenBeltArea; @Schema(description = "总绿化带面积") - private String totalArea; + private Float totalArea; @Schema(description = "行道树(棵)面积") - private String treeArea; + private Float treeArea; @Schema(description = "起点经度") private String startingLatitude; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadRespVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadRespVO.java index 66eb0c2..702ff9c 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadRespVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadRespVO.java @@ -46,19 +46,19 @@ public class RoadRespVO { @Schema(description = "行道树绿化面积", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("行道树绿化面积") - private String greenBeltTreeArea; + private Float greenBeltTreeArea; @Schema(description = "绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("绿化带面积") - private String greenBeltArea; + private Float greenBeltArea; @Schema(description = "总绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("总绿化带面积") - private String totalArea; + private Float totalArea; @Schema(description = "行道树(棵)面积", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("行道树(棵)面积") - private String treeArea; + private Float treeArea; @Schema(description = "起点经度", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("起点经度") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java index 7d56ddf..4906dd5 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadSaveReqVO.java @@ -39,24 +39,28 @@ public class RoadSaveReqVO { private String direction; @Schema(description = "行道树绿化面积", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "行道树绿化面积不能为空") - @Size(min=1, max = 200000, message = "行道树绿化面积长度") - private String greenBeltTreeArea; + @NotNull(message = "行道树绿化面积") // 注意：Float 是包装类，用 @NotNull + @DecimalMin(value = "0.0", inclusive = true, message = "绿化带面积不能小于 0") + @DecimalMax(value = "99999.99", inclusive = true, message = "绿化带面积不能大于 99999.99") + private Float greenBeltTreeArea; @Schema(description = "绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "绿化带面积不能为空") - @Size(min=1, max = 200000, message = "绿化带面积长度") - private String greenBeltArea; + @NotNull(message = "绿化带面积") // 注意：Float 是包装类，用 @NotNull + @DecimalMin(value = "0.0", inclusive = true, message = "绿化带面积不能小于 0") + @DecimalMax(value = "99999.99", inclusive = true, message = "绿化带面积不能大于 99999.99") + private Float greenBeltArea; @Schema(description = "总绿化带面积", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "总绿化带面积不能为空") - @Size(min=1, max = 200000, message = "总绿化带面积长度") - private String totalArea; + @NotNull(message = "总绿化带面积不能为空") // 注意：Float 是包装类，用 @NotNull + @DecimalMin(value = "0.0", inclusive = true, message = "总绿化带面积不能小于 0") + @DecimalMax(value = "99999.99", inclusive = true, message = "总绿化带面积不能大于 99999.99") + private Float totalArea; @Schema(description = "行道树(棵)面积", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "行道树(棵)面积不能为空") - @Size(min=1, max = 50, message = "行道树(棵)面积长度1-50") - private String treeArea; + @NotNull(message = "行道树(棵)面积不能为空") // 注意：Float 是包装类，用 @NotNull + @DecimalMin(value = "0.0", inclusive = true, message = "行道树(棵)面积不能小于 0") + @DecimalMax(value = "99999.99", inclusive = true, message = "行道树(棵)面积不能大于 99999.99") + private Float treeArea; @Schema(description = "起点经度", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "起点经度不能为空") diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java index ca75eba..62fbf0e 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java @@ -16,6 +16,8 @@ import java.util.Set; @Data public class AppMaintainPlanDetailListByRoadPageReqVO extends PageParam { + @Schema(description = "计划批次号") + private String batchNo; @Schema(description = "道路ID") @NotNull @@ -30,9 +32,9 @@ public class AppMaintainPlanDetailListByRoadPageReqVO extends PageParam { @Schema(description = "计划名称") private String planName; - @Schema(description = "计划批次号列表") - @Hidden - private Set batchNos; +// @Schema(description = "计划批次号列表") +// @Hidden +// private Set batchNos; @Schema(description = "业务线") @Hidden diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadDO.java index 9bc2f81..4dcf7a4 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadDO.java @@ -58,19 +58,19 @@ public class RoadDO extends BaseDO { /** * 行道树绿化面积 */ - private String greenBeltTreeArea; + private Float greenBeltTreeArea; /** * 绿化带面积 */ - private String greenBeltArea; + private Float greenBeltArea; /** * 总绿化带面积 */ - private String totalArea; + private Float totalArea; /** * 行道树(棵)面积 */ - private String treeArea; + private Float treeArea; /** * 起点经度 */ diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java index 59fa58a..4e72842 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java @@ -116,9 +116,9 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService } /*1.查询登录用户角色*/ - Set batchNos = this.getBatchNosByLoginUserId(); - pageReqVO.setLocalDateTime(LocalDateTime.now()); - pageReqVO.setBatchNos(batchNos); +// Set batchNos = this.getBatchNosByLoginUserId(); +// pageReqVO.setLocalDateTime(LocalDateTime.now()); +// pageReqVO.setBatchNos(batchNos); /*2.分页*/ IPage mpPage = MyBatisUtils.buildPage(pageReqVO); IPage page = maintainPlanDetailMapper.appMaintainPlanDetailListByRoadPage(mpPage, pageReqVO); diff --git a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml index 37c323f..1753052 100644 --- a/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml +++ b/urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml @@ -43,11 +43,8 @@ #{busiLine} - - AND a.batch_no IN - - #{batchNo} - + + AND a.batch_no= #{req.batchNo} -- libgit2 0.21.4