设备流量卡充值 分页查询增加时间区间

device-api-service/src/main/java/com/xy/service/DeviceChargingHistoryServiceImpl.java

@@ -12,7 +12,6 @@ import com.xy.collections.list.JList;
 import com.xy.config.DeviceThreadPoolConfig;
 import com.xy.config.FileConfig;
 import com.xy.dto.DeviceChargingHistoryDto;
-import com.xy.dto.MercDeviceAlgorithmChargingDto;
 import com.xy.dto.OrderMercManageDto;
 import com.xy.dto.be.MercDto;
 import com.xy.entity.DeviceChargingHistory;
@@ -69,6 +68,8 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
     @ApiOperation("分页查询")
     public R<PageBean<DeviceChargingHistoryDto.Vo>> page(DeviceChargingHistoryDto.Page page) {
         LambdaQueryWrapper<DeviceChargingHistory> lambdaQueryWrapper = new MybatisPlusQuery().eqWrapper(page, DeviceChargingHistory.class)
+                .ge(DeviceChargingHistory::getCreateTime, page.getBeginCreateTime())
+                .le(DeviceChargingHistory::getCreateTime, page.getEndCreateTime())
                 .build()
                 .orderByDesc(DeviceChargingHistory::getCreateTime);
         IPage<DeviceChargingHistory> iPage = page(PlusBeans.toIPage(page.getPage()), lambdaQueryWrapper);

device-api/src/main/java/com/xy/dto/DeviceChargingHistoryDto.java

@@ -73,6 +73,13 @@ public class DeviceChargingHistoryDto {
         @ApiModelProperty("分页对象")
         private PageBean page;
 
+        @ApiModelProperty(value = "创建时间-起")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime beginCreateTime;
+
+        @ApiModelProperty(value = "创建时间-始")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime endCreateTime;
     }
 
     @Data