zjh 本地 2024/06/26 --3修改签到撤销接口不判断作废状态

zjh

2024-06-26 ec2bb08f0aad10bbf1f133046d8e9943be3a6d72

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

@@ -306,7 +306,6 @@
                    if (s.equals(tjOrder.getCheckDoctor()) && tjOrder.getReleaseTime() != null) {
                        releaseCount++;
                    }
                    // TODO: 2023/3/31 发送短信/邮件统计
                    if (s.equals(tjOrder.getCheckDoctor()) && "1".equals(tjOrder.getSendEmail())) {
                        messageCount++;
                    }
@@ -610,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"));
    }

    /**
@@ -623,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)"));
    }

    /**
@@ -634,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())));
    }

    /**
@@ -645,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())));
    }


@@ -720,13 +730,14 @@
        Integer tuan=0;
        BigDecimal shouyi=new BigDecimal(0);
        for (TjOrder tjOrder : list) {
            final TjCustomer byId = customerService.getById(tjOrder.getUserId());
            if (byId.getCusSex()==0){
                boys+=1;
            }else if (byId.getCusSex()==1){
                girls+=1;
            TjCustomer customer = customerService.getById(tjOrder.getUserId());
            if(null !=customer){
                if (customer.getCusSex()==0){
                    boys+=1;
                }else if (customer.getCusSex()==1){
                    girls+=1;
                }
            }

            if ("2".equals(tjOrder.getTjType())){
                person+=1;
            } else if ("1".equals(tjOrder.getTjType())) {
@@ -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);