diff --git a/jeecg-module-main/pom.xml b/jeecg-module-main/pom.xml index 6de067f5..7ed9e916 100644 --- a/jeecg-module-main/pom.xml +++ b/jeecg-module-main/pom.xml @@ -16,6 +16,10 @@ org.jeecgframework.boot jeecg-boot-base-core + + org.jeecgframework.boot + jeecg-system-biz + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java index 725efecd..67d73cc2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java @@ -10,6 +10,7 @@ import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.CommonAPI; import org.jeecg.common.api.vo.Result; @@ -197,6 +198,8 @@ public class KcKetangbiaoController extends JeecgController getCountList(String skrq) { + Map rmap = Maps.newHashMap(); + //第一句-今日课堂 QueryWrapper qw = new QueryWrapper(); qw.select("count(*) - 0 num",//【今日课堂数:总数】 "count( CASE WHEN zbpx = '1' THEN '1' END ) txktnum",//【今日课堂数:腾讯】 @@ -206,20 +209,33 @@ public class KcKetangbiaoController extends JeecgController hhks THEN 1 END ) zzsknum"//【上课中】 ); qw.eq("skrq",skrq); -// select -// count(*) - 0 num, -- 【今日课堂数:总数】 -// count( CASE WHEN zbpx = '1' THEN '1' END ) txktnum, -- 【今日课堂数:腾讯】 -// count( CASE WHEN zbpx = '4' THEN '1' END ) ddktnum, --【今日课堂数:钉钉】 -// count( CASE WHEN zbpx IN ( '2', '3', '5', '6', '7', '8' ) THEN '1' END ) qtktnum, -- 【今日课堂数:其他】 -// count( CASE WHEN date_format( now(), '%H%i' ) > hhjs THEN 1 END ) xkktnum, -- 【今日课堂数:已下课】 -// count( CASE WHEN date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > hhks THEN 1 END ) zzsknum -- 【上课中】 -// FROM ketangbiao -// WHERE skrq = '2023-04-03' - List> kcKetangbiao = kcKetangbiaoService.listMaps(qw); - if(kcKetangbiao==null) { - return Result.error("未找到对应数据"); + List> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw); + if(kcKetangbiaoList != null && !kcKetangbiaoList.isEmpty()){ + rmap.put("jinRiKeTang",kcKetangbiaoList.get(0)); } - return Result.OK(kcKetangbiao); + //第二句-今日听课 + + List> kcKetangbiao2List = kcKetangbiaoService.selectJrTkCount(skrq); + if(kcKetangbiao2List != null && !kcKetangbiao2List.isEmpty()){ + rmap.put("jinRiTingKe",kcKetangbiao2List.get(0)); + } + //查询第三句-累计课堂 + + QueryWrapper qw3 = new QueryWrapper(); + qw3.select("count(*) - 0 num",//【已开课堂数:总数】 + "count( CASE WHEN zbpx = '1' THEN '1' END ) txktnum",//【腾讯课堂数】 + "count( CASE WHEN zbpx = '4' THEN '1' END ) ddktnum",//【钉钉课堂数】 + "count( CASE WHEN zbpx IN ( '2', '3', '5', '6', '7', '8' ) THEN '1' END ) qtktnum",//【其他课堂数】 + "count( CASE WHEN date_format( now(), '%H%i' ) > hhjs THEN 1 END ) xkktnum",//【下课课堂数】 + "count( CASE WHEN date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > hhks THEN 1 END ) zzsknum"//【正在上课课堂数】 + ); + qw3.ge(skrq,"2023-02-19");//<= + qw3.le(skrq,skrq);//>= + List> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3); + if(kcKetangbiao3List != null && !kcKetangbiao3List.isEmpty()){ + rmap.put("yiKaiKeTang",kcKetangbiao3List.get(0)); + } + return Result.OK(rmap); } //------------------------------yangjun------------------------------ diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java index 009bb313..26753c9e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java @@ -1,6 +1,7 @@ package org.jeecg.modules.kc.ktgl.mapper; import java.util.List; +import java.util.Map; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,4 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface KcKetangbiaoMapper extends BaseMapper { IPage getKclblist(Page page,KcKetangbiao kcKetangbiao); + + List> selectJrTkCount(String skrq); + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index 764add86..dc8cfbc5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml @@ -1,6 +1,21 @@ + +