槽液结果查询修改

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java

@@ -94,13 +94,23 @@ public class LiquidTankReportController extends BladeController {
     @Operation(summary = "list分页", description = "传入LiquidTankReport Obj")
     public R<IPage<LiquidTankReportVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> liquidTankReport,
                                              Query query) {
+
+        Date crStart = null;
+        Date crEnd = null;
+        if(null != liquidTankReport.get("createTimeStart") && !"".equals(liquidTankReport.get("createTimeStart"))){
+            crStart = RequestUtil.buildDateBeginOfDay(liquidTankReport, BaseRequest.CREATE_TIME_START);
+            crEnd = RequestUtil.buildDateEndOfDay(liquidTankReport, BaseRequest.CREATE_TIME_END);
+        }
         QueryWrapper<LiquidTankReport> qw = Condition.getQueryWrapper(liquidTankReport, LiquidTankReport.class);
         qw.eq(liquidTankReport.containsKey("name"), LiquidTankReport.COL_NAME, liquidTankReport.get("name"));
-        if (liquidTankReport.containsKey(BaseRequest.CREATE_TIME_START) && liquidTankReport.containsKey(BaseRequest.CREATE_TIME_END)) {
-            Date crStart = RequestUtil.buildDateBeginOfDay(liquidTankReport, BaseRequest.CREATE_TIME_START);
-            Date crEnd = RequestUtil.buildDateEndOfDay(liquidTankReport, BaseRequest.CREATE_TIME_END);
+        if(null != crStart && null != crEnd){
             qw.between(BaseCol.CREATE_TIME, crStart, crEnd);
         }
+//        if (liquidTankReport.containsKey(BaseRequest.CREATE_TIME_START) && liquidTankReport.containsKey(BaseRequest.CREATE_TIME_END)) {
+//            Date crStart = RequestUtil.buildDateBeginOfDay(liquidTankReport, BaseRequest.CREATE_TIME_START);
+//            Date crEnd = RequestUtil.buildDateEndOfDay(liquidTankReport, BaseRequest.CREATE_TIME_END);
+//            qw.between(BaseCol.CREATE_TIME, crStart, crEnd);
+//        }
         IPage<LiquidTankReport> pages = service.page(Condition.getPage(query), qw);
         IPage<LiquidTankReportVO> pagesVO = LiquidTankReportWrapper.build().pageVO(pages);
         for(LiquidTankReportVO one : pagesVO.getRecords()){