From b31fdd0af6ee9145b435ca08b9c9411fc359a00c Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Mon, 3 Apr 2023 23:57:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2023=E5=B9=B44=E6=9C=883=E6=97=A5=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcKetangbiaoController.java | 42 +++++++++++++------ .../kc/ktgl/mapper/KcKetangbiaoMapper.java | 3 ++ .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 15 +++++++ .../kc/ktgl/service/IKcKetangbiaoService.java | 5 +++ .../service/impl/KcKetangbiaoServiceImpl.java | 7 ++++ 5 files changed, 59 insertions(+), 13 deletions(-) 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 fc3fd4d6..c389d722 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.vo.Result; import org.jeecg.common.system.query.QueryGenerator; @@ -188,6 +189,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",//【今日课堂数：腾讯】 @@ -197,20 +200,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 e510caab..43ac422d 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 org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; @@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface KcKetangbiaoMapper extends BaseMapper { + 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 f2558832..0b58a8fb 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,5 +1,20 @@ + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java index 7aa77d43..5a835840 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java @@ -3,6 +3,9 @@ package org.jeecg.modules.kc.ktgl.service; import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; +import java.util.Map; + /** * @Description: 课堂管理-子表 * @Author: jeecg-boot @@ -11,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IKcKetangbiaoService extends IService { + List> selectJrTkCount(String skrq); + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java index 3b77db33..0ef94690 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java @@ -7,6 +7,9 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; +import java.util.Map; + /** * @Description: 课堂管理-子表 * @Author: jeecg-boot @@ -16,4 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class KcKetangbiaoServiceImpl extends ServiceImpl implements IKcKetangbiaoService { + @Override + public List> selectJrTkCount(String skrq) { + return baseMapper.selectJrTkCount(skrq); + } } From d541030cd35f359cac5d60be9f48537cb343ee4f Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Wed, 5 Apr 2023 10:41:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2023=E5=B9=B44=E6=9C=885=E6=97=A5=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-module-main/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) 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