zjh 2024/07/19-2

zjh

2024-07-19 2f9691b8de0e2800f22ce96768aacfd129f02b3c

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHomePageController.java

@@ -609,7 +609,12 @@
    public Integer ToBeToday() {
        //当前日期拼接开始和结束时间
        //时间字符串类型转换时间类型
        return orderService.count(new QueryWrapper<TjOrder>().between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())).eq("check_status", 0));
        return orderService.count(new QueryWrapper<TjOrder>()
                .between("create_time", DateUtil.beginOfDay(new Date()),
                        DateUtil.endOfDay(new Date()))
                .isNotNull("finish_time")
                .eq("check_status", 0)
                .ne("tj_category","13"));
    }

    /**
@@ -622,7 +627,10 @@
    public Integer checkedToday() {
        //当前日期拼接开始和结束时间
        //时间字符串类型转换时间类型
        return orderService.count(new QueryWrapper<TjOrder>().isNotNull("finish_time").between("finish_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
        return orderService.count(new QueryWrapper<TjOrder>()
                .isNotNull("finish_time")
                .between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()))
                .last("and (check_status=1 OR tj_category=13)"));
    }

    /**
@@ -633,7 +641,9 @@
    public Integer ReportToday() {
        //当前日期拼接开始和结束时间
        //时间字符串类型转换时间类型
        return orderService.count(new QueryWrapper<TjOrder>().isNotNull("report_time").between("report_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
        return orderService.count(new QueryWrapper<TjOrder>()
                .isNotNull("report_time")
                .between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
    }

    /**
@@ -644,7 +654,8 @@
    @GetMapping("/registerToday")
    @ApiOperation(value = "查询今日登记")
    public Integer RegisterToday() {
        return orderService.count(new QueryWrapper<TjOrder>().between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
        return orderService.count(new QueryWrapper<TjOrder>()
                .between("create_time", DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())));
    }


@@ -737,7 +748,10 @@
            wqqq.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
            final List<TjFlowingWater> list1 = tjFlowingWaterService.list(wqqq);
            for (TjFlowingWater tjFlowingWater : list1) {
                shouyi.add(tjFlowingWater.getPaidIn());
                if(null !=tjFlowingWater.getPaidIn()){
                    shouyi.add(tjFlowingWater.getPaidIn());
                }

            }
        }
        chartVo.setBoysNum(boys);