人机材修改

wangqian
1 parent 9690e96e
Showing 2 changed files with 7 additions and 4 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/rentalmechanicalcost/vo/RentalMechanicalCostPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/rentalmechanicalcost/RentalMechanicalCostMapper.java
@@ -19,10 +19,11 @@ public class RentalMechanicalCostPageReqVO extends PageParam {
     private String id;
     @Schema(description = "机械名称", example = "张三")
     private String mechName;
-
+    //租赁价格区间
     @Schema(description = "租赁总价格", example = "316")
-    private BigDecimal[] rentalTotalPrice;
-
+    private BigDecimal rentalTotalPriceMin;
+    @Schema(description = "租赁总价格", example = "316")
+    private BigDecimal rentalTotalPriceMax;
     @Schema(description = "开始使用时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startUseTime;
@@ -20,7 +20,9 @@ public interface RentalMechanicalCostMapper extends BaseMapperX&lt;RentalMechanical
         return selectPage(reqVO, new LambdaQueryWrapperX<RentalMechanicalCostDO>()
                 .likeIfPresent(RentalMechanicalCostDO::getMechName, reqVO.getMechName())
                 //.eqIfPresent(RentalMechanicalCostDO::getMechType, reqVO.getMechType())
-                .betweenIfPresent(RentalMechanicalCostDO::getRentalTotalPrice, reqVO.getRentalTotalPrice())
+                //.betweenIfPresent(RentalMechanicalCostDO::getRentalTotalPrice, reqVO.getRentalTotalPrice())
+                .geIfPresent(RentalMechanicalCostDO::getRentalTotalPrice, reqVO.getRentalTotalPriceMin())
+                .leIfPresent(RentalMechanicalCostDO::getRentalTotalPrice, reqVO.getRentalTotalPriceMax())
                 //.eqIfPresent(RentalMechanicalCostDO::getQuantity, reqVO.getQuantity())
                 //.eqIfPresent(RentalMechanicalCostDO::getLicensePlate, reqVO.getLicensePlate())
                 //.eqIfPresent(RentalMechanicalCostDO::getVehicleCategory, reqVO.getVehicleCategory())