zjh 2024/08/07-1

zjh

2024-08-07 ff584d153492ea746690cf8e05c2b859f170ae0b

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

@@ -74,13 +74,13 @@
                Date beginTime = DateUtils.parseDate(date + " 00:00:00");
                Date endTime = DateUtils.parseDate(date + " 23:59:59");
                QueryWrapper<TjOrder> queryWrapper1 = new QueryWrapper<>();
                queryWrapper1.ge("finish_time", beginTime);
                queryWrapper1.lt("finish_time", endTime);
                queryWrapper1.ge("create_time", beginTime);
                queryWrapper1.lt("create_time", endTime);
                queryWrapper1.eq("tj_type", 2);
                Integer personCount = orderService.count(queryWrapper1);
                QueryWrapper<TjOrder> queryWrapper2 = new QueryWrapper<>();
                queryWrapper2.ge("finish_time", beginTime);
                queryWrapper2.lt("finish_time", endTime);
                queryWrapper2.ge("create_time", beginTime);
                queryWrapper2.lt("create_time", endTime);
                queryWrapper2.eq("tj_type", 1);
                Integer teamCount = orderService.count(queryWrapper2);

@@ -100,14 +100,14 @@
                Date beginTime = DateUtils.parseDate(formatdate + " 00:00:00");
                Date endTime = DateUtils.parseDate(formatdate + " 23:59:59");
                QueryWrapper<TjOrder> queryWrapper1 = new QueryWrapper<>();
                queryWrapper1.ge("finish_time", beginTime);
                queryWrapper1.lt("finish_time", endTime);
                queryWrapper1.ge("create_time", beginTime);
                queryWrapper1.lt("create_time", endTime);
                queryWrapper1.eq("tj_type", 2);
                Integer personCount = orderService.count(queryWrapper1);

                QueryWrapper<TjOrder> queryWrapper2 = new QueryWrapper<>();
                queryWrapper2.ge("finish_time", beginTime);
                queryWrapper2.lt("finish_time", endTime);
                queryWrapper2.ge("create_time", beginTime);
                queryWrapper2.lt("create_time", endTime);
                queryWrapper2.eq("tj_type", 1);
                Integer teamCount = orderService.count(queryWrapper2);

@@ -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())));
    }