养护计划优化提交

王富生
1 parent cd085bae
Showing 7 changed files with 38 additions and 35 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/vo/RoadRespVO.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/app/maintainplan/vo/AppMaintainPlanDetailListByRoadPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/road/RoadDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/maintainplan/MaintainPlanDetailMapper.xml
@@ -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;
@@ -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("起点经度")
@@ -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 = "起点经度不能为空")
@@ -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<String> batchNos;
+//    @Schema(description = "计划批次号列表")
+//    @Hidden
+//    private Set<String> batchNos;
     @Schema(description = "业务线")
     @Hidden
@@ -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;
     /**
      * 起点经度
      */
@@ -116,9 +116,9 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
         }
         /*1.查询登录用户角色*/
-        Set<String> batchNos = this.getBatchNosByLoginUserId();
-        pageReqVO.setLocalDateTime(LocalDateTime.now());
-        pageReqVO.setBatchNos(batchNos);
+//        Set<String> batchNos = this.getBatchNosByLoginUserId();
+//        pageReqVO.setLocalDateTime(LocalDateTime.now());
+//        pageReqVO.setBatchNos(batchNos);
         /*2.分页*/
         IPage<AppMaintainPlanDetailRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
         IPage<AppMaintainPlanDetailRespVO> page = maintainPlanDetailMapper.appMaintainPlanDetailListByRoadPage(mpPage, pageReqVO);
@@ -43,11 +43,8 @@
                 #{busiLine}
             </foreach>
         </if>
-        <if test="req.batchNos != null and req.batchNos.size() > 0">
-            AND a.batch_no IN
-            <foreach collection="req.batchNos" item="batchNo" open="(" separator="," close=")">
-                #{batchNo}
-            </foreach>
+        <if test="req.batchNo!= null and req.batchNo !=''">
+            AND a.batch_no= #{req.batchNo}
         </if>
         <!--状态 1:未完成;2:已完成;3:已失效-->
         <if test="req.finishState == 3">