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 3eb6579e..2365779c 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 @@ -62,6 +62,9 @@ public class KcKetangbiaoController extends JeecgController getCountList(String skrq) { Map rmap = Maps.newHashMap(); - String startTime = "2023-02-19"; //第一句-今日课堂 QueryWrapper qw = new QueryWrapper(); qw.select("count(*) - 0 num",//【今日课堂数:总数】 @@ -248,6 +250,140 @@ public class KcKetangbiaoController extends JeecgController jrktzsList(String skrq) { + //第一句-今日课堂-总数 + QueryWrapper qw = new QueryWrapper(); + qw.select("*"); + qw.eq("skrq", skrq); + List> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw); + return Result.OK(kcKetangbiaoList); + } + + /** + * 今日课堂已下课数详情 + * + * @param skrq + * @return + */ + @ApiOperation(value="课堂管理-子表-今日课堂已下课数详情", notes="课堂管理-子表-今日课堂已下课数详情") + @GetMapping(value = "/jrktyxkList") + public Result jrktyxkList(String skrq) { + //第一句-今日课堂-已下课数 + QueryWrapper qw = new QueryWrapper(); + qw.select("*"); + qw.eq("skrq", skrq); + qw.apply("date_format( now(), '%H%i' ) > hhjs"); + List> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw); + return Result.OK(kcKetangbiaoList); + } + + /** + * 今日课堂上课中详情 + * + * @param skrq + * @return + */ + @ApiOperation(value="课堂管理-子表-今日课堂上课中详情", notes="课堂管理-子表-今日课堂上课中详情") + @GetMapping(value = "/skzList") + public Result skzList(String skrq) { + //第一句-今日课堂-上课中 + QueryWrapper qw = new QueryWrapper(); + qw.select("*"); + qw.eq("skrq", skrq); + qw.apply("date_format( now(), '%H%i' ) < hhjs AND date_format( now(), '%H%i' ) > hhks"); + List> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw); + return Result.OK(kcKetangbiaoList); + } + + /** + * 已开课堂总数详情 + * + * @param skrq + * @return + */ + @ApiOperation(value="课堂管理-子表-已开课堂总数详情", notes="课堂管理-子表-已开课堂总数详情") + @GetMapping(value = "/ykktzsList") + public Result ykktzsList(String skrq) { + //查询第三句-已开课堂总数 + QueryWrapper qw3 = new QueryWrapper(); + qw3.select("*"); + qw3.ge("skrq",startTime);//<= + qw3.le("skrq",skrq);//>= + List> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3); + return Result.OK(kcKetangbiao3List); + } + + /** + * 已开课堂听课课堂详情 + * + * @param skrq + * @return + */ + @ApiOperation(value="课堂管理-子表-已开课堂听课课堂详情", notes="课堂管理-子表-已开课堂听课课堂详情") + @GetMapping(value = "/ykkttkktList") + public Result ykkttkktList(String skrq) { + //查询第三句-已开课堂听课课堂 + KcKetangbiao kcKetangbiao = new KcKetangbiao(); + kcKetangbiao.setStartTime(startTime); + kcKetangbiao.setEndTime(skrq); + List> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkktList(kcKetangbiao); + return Result.OK(listTjIndex); + } + + /** + * 已开课堂听课课堂详情 听课人次 + * + * @param skrq + * @return + */ + @ApiOperation(value="课堂管理-子表-已开课堂听课课堂详情", notes="课堂管理-子表-已开课堂听课课堂详情") + @GetMapping(value = "/ykkttkrcList") + public Result ykkttkrcList(String skrq) { + //查询第三句-已开课堂听课课堂 + KcKetangbiao kcKetangbiao = new KcKetangbiao(); + kcKetangbiao.setStartTime(startTime); + kcKetangbiao.setEndTime(skrq); + List> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkrcList(kcKetangbiao); + return Result.OK(listTjIndex); + } + + /** + * 已开课堂听课课堂详情 听课人次 + * + * @param skrq + * @return + */ + @ApiOperation(value="课堂管理-子表-已开课堂听课课堂详情", notes="课堂管理-子表-已开课堂听课课堂详情") + @GetMapping(value = "/jrtkktsList") + public Result jrtkktsList(String skrq) { + //查询第三句-已开课堂听课课堂 + List> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtkktsList(skrq); + return Result.OK(kcKetangbiao2List); + } + + /** + * 已开课堂听课课堂详情 听课人次 + * + * + * @param skrq + * @return + */ + @ApiOperation(value="课堂管理-子表-已开课堂听课课堂详情", notes="课堂管理-子表-已开课堂听课课堂详情") + @GetMapping(value = "/jrtktkrcList") + public Result jrtktkrcList(String skrq) { + //查询第三句-已开课堂听课课堂 + List> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtktkrcList(skrq); + return Result.OK(kcKetangbiao2List); + } + //------------------------------yangjun------------------------------ @ApiOperation(value="课堂管理-子表-分页列表查询", notes="课堂管理-子表-分页列表查询") 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 82142bf9..a7372ef2 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 @@ -31,4 +31,12 @@ public interface KcKetangbiaoMapper extends BaseMapper { List selectSyncList(KcKetangbiao kcKetangbiao); void saveHis(KcKetangbiao kcKetangbiaohis); + + List> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao); + + List> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao); + + List> selectJrTkJrtkktsList(String skrq); + + List> selectJrTkJrtktkrcList(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 f16ff9af..485e33a6 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 @@ -137,6 +137,53 @@ '' as sfxsk,jgh,bz,zt,jsbh,kcdl from kc_kechengbiao + + + + + + + insert into kc_ketangbiao_his select *,#{ts} from kc_ketangbiao 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 d7ef8854..5a928801 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 @@ -32,4 +32,12 @@ public interface IKcKetangbiaoService extends IService { * @param kcKetangbiaohis */ void saveHis(KcKetangbiao kcKetangbiaohis); + + List> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao); + + List> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao); + + List> selectJrTkJrtkktsList(String skrq); + + List> selectJrTkJrtktkrcList(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 24fd7502..a5e289eb 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 @@ -51,4 +51,24 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao) { + return baseMapper.getIndexYkktstjYkkttkktList(kcKetangbiao); + } + + @Override + public List> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao) { + return baseMapper.getIndexYkktstjYkkttkrcList(kcKetangbiao); + } + + @Override + public List> selectJrTkJrtkktsList(String skrq) { + return baseMapper.selectJrTkJrtkktsList(skrq); + } + + @Override + public List> selectJrTkJrtktkrcList(String skrq) { + return baseMapper.selectJrTkJrtktkrcList(skrq); + } }