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 2365779c..65bc0393 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 @@ -245,8 +245,6 @@ public class KcKetangbiaoController extends JeecgController jrktzsList(String skrq) { + public Result jrktzsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //第一句-今日课堂-总数 QueryWrapper qw = new QueryWrapper(); qw.select("*"); qw.eq("skrq", skrq); - List> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiaoList = kcKetangbiaoService.pageMaps(page,qw); return Result.OK(kcKetangbiaoList); } @@ -275,13 +274,14 @@ public class KcKetangbiaoController extends JeecgController jrktyxkList(String skrq) { + public Result jrktyxkList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,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); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiaoList = kcKetangbiaoService.pageMaps(page,qw); return Result.OK(kcKetangbiaoList); } @@ -293,13 +293,14 @@ public class KcKetangbiaoController extends JeecgController skzList(String skrq) { + public Result skzList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,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); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiaoList = kcKetangbiaoService.pageMaps(page,qw); return Result.OK(kcKetangbiaoList); } @@ -311,13 +312,14 @@ public class KcKetangbiaoController extends JeecgController ykktzsList(String skrq) { + public Result ykktzsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //查询第三句-已开课堂总数 QueryWrapper qw3 = new QueryWrapper(); qw3.select("*"); qw3.ge("skrq",startTime);//<= qw3.le("skrq",skrq);//>= - List> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiao3List = kcKetangbiaoService.pageMaps(page,qw3); return Result.OK(kcKetangbiao3List); } @@ -329,12 +331,13 @@ public class KcKetangbiaoController extends JeecgController ykkttkktList(String skrq) { + public Result ykkttkktList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //查询第三句-已开课堂听课课堂 KcKetangbiao kcKetangbiao = new KcKetangbiao(); kcKetangbiao.setStartTime(startTime); kcKetangbiao.setEndTime(skrq); - List> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkktList(kcKetangbiao); + Page> page = new Page<>(pageNo, pageSize); + IPage> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkktList(page,kcKetangbiao); return Result.OK(listTjIndex); } @@ -346,12 +349,13 @@ public class KcKetangbiaoController extends JeecgController ykkttkrcList(String skrq) { + public Result ykkttkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //查询第三句-已开课堂听课课堂 KcKetangbiao kcKetangbiao = new KcKetangbiao(); kcKetangbiao.setStartTime(startTime); kcKetangbiao.setEndTime(skrq); - List> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkrcList(kcKetangbiao); + Page> page = new Page<>(pageNo, pageSize); + IPage> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkrcList(page,kcKetangbiao); return Result.OK(listTjIndex); } @@ -363,9 +367,10 @@ public class KcKetangbiaoController extends JeecgController jrtkktsList(String skrq) { + public Result jrtkktsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //查询第三句-已开课堂听课课堂 - List> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtkktsList(skrq); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtkktsList(page,skrq); return Result.OK(kcKetangbiao2List); } @@ -378,9 +383,10 @@ public class KcKetangbiaoController extends JeecgController jrtktkrcList(String skrq) { + public Result jrtktkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) { //查询第三句-已开课堂听课课堂 - List> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtktkrcList(skrq); + Page> page = new Page<>(pageNo, pageSize); + IPage> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtktkrcList(page,skrq); return Result.OK(kcKetangbiao2List); } 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 a7372ef2..15e9ff15 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 @@ -32,11 +32,11 @@ public interface KcKetangbiaoMapper extends BaseMapper { void saveHis(KcKetangbiao kcKetangbiaohis); - List> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao); + List> getIndexYkktstjYkkttkktList(Page> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao); - List> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao); + List> getIndexYkktstjYkkttkrcList(Page> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao); - List> selectJrTkJrtkktsList(String skrq); + List> selectJrTkJrtkktsList(Page> page, @Param("skrq") String skrq); - List> selectJrTkJrtktkrcList(String skrq); + List> selectJrTkJrtktkrcList(Page> page, @Param("skrq") 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 485e33a6..127b2782 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 @@ -142,11 +142,11 @@ * FROM kc_ketangbiao k, kc_tingke t WHERE k.id = t.kechengbiaoid and t.tingketime > '1' - - AND skrq >= #{startTime} + + AND skrq >= #{et.startTime} - - AND skrq <= #{endTime} + + AND skrq <= #{et.endTime} @@ -155,11 +155,11 @@ * FROM kc_ketangbiao k, kc_tingke t WHERE k.id = t.kechengbiaoid and t.tingketime > '1' - - AND skrq >= #{startTime} + + AND skrq >= #{et.startTime} - - AND skrq <= #{endTime} + + AND skrq <= #{et.endTime} 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 5a928801..a962ce55 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 @@ -33,11 +33,11 @@ public interface IKcKetangbiaoService extends IService { */ void saveHis(KcKetangbiao kcKetangbiaohis); - List> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao); + IPage> getIndexYkktstjYkkttkktList(Page> page,KcKetangbiao kcKetangbiao); - List> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao); + IPage> getIndexYkktstjYkkttkrcList(Page> page,KcKetangbiao kcKetangbiao); - List> selectJrTkJrtkktsList(String skrq); + IPage> selectJrTkJrtkktsList(Page> page,String skrq); - List> selectJrTkJrtktkrcList(String skrq); + IPage> selectJrTkJrtktkrcList(Page> page,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 a5e289eb..a6cbe413 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 @@ -53,22 +53,22 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao) { - return baseMapper.getIndexYkktstjYkkttkktList(kcKetangbiao); + public IPage> getIndexYkktstjYkkttkktList(Page> page, KcKetangbiao kcKetangbiao) { + return page.setRecords(baseMapper.getIndexYkktstjYkkttkktList(page, kcKetangbiao)); } @Override - public List> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao) { - return baseMapper.getIndexYkktstjYkkttkrcList(kcKetangbiao); + public IPage> getIndexYkktstjYkkttkrcList(Page> page, KcKetangbiao kcKetangbiao) { + return page.setRecords(baseMapper.getIndexYkktstjYkkttkrcList(page, kcKetangbiao)); } @Override - public List> selectJrTkJrtkktsList(String skrq) { - return baseMapper.selectJrTkJrtkktsList(skrq); + public IPage> selectJrTkJrtkktsList(Page> page, String skrq) { + return page.setRecords(baseMapper.selectJrTkJrtkktsList(page, skrq)); } @Override - public List> selectJrTkJrtktkrcList(String skrq) { - return baseMapper.selectJrTkJrtktkrcList(skrq); + public IPage> selectJrTkJrtktkrcList(Page> page, String skrq) { + return page.setRecords(baseMapper.selectJrTkJrtktkrcList(page, skrq)); } }