Merge branch 'master' of https://gitee.com/mini-org-project/course_information_center_java
# Conflicts: # jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java # jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java # jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java
This commit is contained in:
commit
0d3bf97a7e
|
|
@ -16,6 +16,10 @@
|
|||
<groupId>org.jeecgframework.boot</groupId>
|
||||
<artifactId>jeecg-boot-base-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jeecgframework.boot</groupId>
|
||||
<artifactId>jeecg-system-biz</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
|
@ -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<KcKetangbiao, IKcKet
|
|||
@ApiOperation(value="课堂管理-子表-查询统计信息", notes="课堂管理-子表-查询统计信息")
|
||||
@GetMapping(value = "/getCountList")
|
||||
public Result<Object> getCountList(String skrq) {
|
||||
Map<String, Object> 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<KcKetangbiao, IKcKet
|
|||
"count( CASE WHEN date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > 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<java.util.Map<String, Object>> kcKetangbiao = kcKetangbiaoService.listMaps(qw);
|
||||
if(kcKetangbiao==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
List<Map<String, Object>> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw);
|
||||
if(kcKetangbiaoList != null && !kcKetangbiaoList.isEmpty()){
|
||||
rmap.put("jinRiKeTang",kcKetangbiaoList.get(0));
|
||||
}
|
||||
return Result.OK(kcKetangbiao);
|
||||
//第二句-今日听课
|
||||
|
||||
List<Map<String, Object>> 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<Map<String, Object>> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3);
|
||||
if(kcKetangbiao3List != null && !kcKetangbiao3List.isEmpty()){
|
||||
rmap.put("yiKaiKeTang",kcKetangbiao3List.get(0));
|
||||
}
|
||||
return Result.OK(rmap);
|
||||
}
|
||||
|
||||
//------------------------------yangjun------------------------------
|
||||
|
|
|
|||
|
|
@ -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<KcKetangbiao> {
|
||||
|
||||
IPage<KcKetangbiao> getKclblist(Page<KcKetangbiao> page,KcKetangbiao kcKetangbiao);
|
||||
|
||||
List<Map<String,Object>> selectJrTkCount(String skrq);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,21 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.jeecg.modules.kc.ktgl.mapper.KcKetangbiaoMapper">
|
||||
|
||||
<select id="selectJrTkCount" resultType="java.util.Map">
|
||||
SELECT
|
||||
<!-- -- 【今日听课：课堂数？】-->
|
||||
count( DISTINCT ( CASE WHEN t.tingketime > '1' THEN k.id END ))+ 0 btkktnum,
|
||||
<!-- -- 【今日听课：听课人次】-->
|
||||
count( CASE WHEN t.tingketime > '1' THEN '1' END ) + 0 tkrcnum,
|
||||
<!-- -- 检查课堂数（页面无对应关系）-->
|
||||
count( DISTINCT ( CASE WHEN t.jianchatime > '1' THEN k.id END )) jcktnum
|
||||
FROM kc_ketangbiao k, kc_tingke t
|
||||
WHERE k.id = t.kechengbiaoid
|
||||
<if test="skrq != '' and skrq != null">
|
||||
AND skrq = #{skrq}
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
<select id="getKclblist" parameterType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao" resultType="org.jeecg.modules.kc.ktgl.entity.KcKetangbiao">
|
||||
|
|
|
|||
|
|
@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|||
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
|
||||
|
|
@ -15,4 +18,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
|||
public interface IKcKetangbiaoService extends IService<KcKetangbiao> {
|
||||
|
||||
IPage<KcKetangbiao> getKclblist(Page<KcKetangbiao> page, KcKetangbiao kcKetangbiao);
|
||||
|
||||
List<Map<String,Object>> selectJrTkCount(String skrq);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,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
|
||||
|
|
@ -23,4 +26,9 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
|
|||
public IPage<KcKetangbiao> getKclblist(Page<KcKetangbiao> page, KcKetangbiao kcKetangbiao) {
|
||||
return baseMapper.getKclblist(page,kcKetangbiao);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Map<String, Object>> selectJrTkCount(String skrq) {
|
||||
return baseMapper.selectJrTkCount(skrq);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue