zjh 2024/08/02-1

zjh

2024-08-05 ee2262faf471f901f33144703ce1e5de6dc5ac90

zjh 2024/08/02-1

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -1786,7 +1786,8 @@
        }
        //获取体检异常数
        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
        wq1.between(TjOrder::getFinishTime, DateUtil.lastMonth(), DateUtil.now());
        wq1.between(TjOrder::getCreateTime, DateUtil.lastMonth(), DateUtil.now());
        wq1.isNotNull(TjOrder::getFinishTime);
        wq1.eq(TjOrder::getCheckStatus, 1);
        List<TjOrder> orderAbnormalCountList = orderService.list(wq1);
        if (null != orderAbnormalCountList && orderAbnormalCountList.size() > 0) {

 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);


 ltkj-admin/src/main/resources/application.yml

@@ -4,4 +4,4 @@
#test 泾川县部署测试环境使用
spring:
  profiles:
    active: prod
    active: dev

 ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java

@@ -264,7 +264,7 @@
        List<TjCustomer> customerList = customerService.list(wq);
        if (null == customerList || customerList.size() == 0) {
            //throw new ServiceException("登录用户：" + username + " 不存在");
            throw new ServiceException("账户或密码错误，请检查！");
            throw new ServiceException("账号或密码错误，请检查！");
        }
        for (TjCustomer tjCustomer : customerList) {
            try {

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderMapper.java

@@ -109,9 +109,9 @@
//    List<Map<Object, Object>> getLine();

    @Select("select aa.date,\n" +
            "      sum(if(c.tj_type='团队', ifnull(c.coun,0),0)) as tdcoun,\n" +
            "      sum(if(c.tj_type='个人', ifnull(c.coun,0),0)) as grcoun,\n" +
            "      sum(if(c.tj_type='报告', ifnull(c.coun,0),0)) as bgcoun \n" +
            "                  sum(if(c.tj_type='1', ifnull(c.coun,0),0)) as tdcoun,\n" +
            "                  sum(if(c.tj_type='2', ifnull(c.coun,0),0)) as grcoun,\n" +
            "                  sum(if(c.tj_type='3', ifnull(c.coun,0),0)) as bgcoun \n" +
            "  from (\n" +
            "      SELECT date_sub(CURDATE(),interval @i:=@i+1 day) as date\n" +
            "      from (select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all select 1 union all \n" +
@@ -122,12 +122,16 @@
            "            (select @i:= -1) b) aa \n" +
            "  left join (\n" +
            "      select date_format(create_time, '%Y-%m-%d') dat, tj_type, count(*) coun\n" +
            "      from tj_order where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
            "      group by date_format(create_time, '%Y-%m-%d'),tj_type\n" +
            "      union\n" +
            "      select date_format(report_time, '%Y-%m-%d') dat, '报告' tj_type, count(*) coun\n" +
            "      from tj_order where DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
            "      group by date_format(report_time, '%Y-%m-%d')\n" +
            "                  from tj_order where deleted=0 AND tj_type=2 AND DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
            "                  group by date_format(create_time, '%Y-%m-%d')\t\n" +
            "\t\t\t\tunion\n" +
            "                  select date_format(create_time, '%Y-%m-%d') dat,tj_type, count(*) coun\n" +
            "                  from tj_order where deleted=0 AND tj_type=1 AND  DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
            "                  group by date_format(create_time, '%Y-%m-%d')\t\t\t\t\t\n" +
            "\t\t\t\tunion\n" +
            "                  select date_format(create_time, '%Y-%m-%d') dat, 3 tj_type, count(*) coun\n" +
            "                  from tj_order where deleted=0 AND !ISNULL(report_time) AND  DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= date(create_time)\n" +
            "                  group by date_format(create_time, '%Y-%m-%d')\n" +
            "      ) c on c.dat =aa.date\n" +
            "group by aa.date")
    List<LineChartsVo> getLine();