yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023年5月24日 添加分页

This commit is contained in:
bai 2023-05-24 21:11:38 +08:00
parent eedcc7f793
commit 9fbd8befa5
5 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
View File

@ -245,8 +245,6 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
if(listTjIndex != null && !listTjIndex.isEmpty()){
rmap.put("yiKaiKeTangNew",listTjIndex.get(0));
}
return Result.OK(rmap);
}
@ -258,12 +256,13 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-今日课堂总数详情", notes="课堂管理-子表-今日课堂总数详情")
@GetMapping(value = "/jrktzsList")
public Result<?> 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<Map<String, Object>> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw);
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> kcKetangbiaoList = kcKetangbiaoService.pageMaps(page,qw);
return Result.OK(kcKetangbiaoList);
}
@ -275,13 +274,14 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-今日课堂已下课数详情", notes="课堂管理-子表-今日课堂已下课数详情")
@GetMapping(value = "/jrktyxkList")
public Result<?> 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<Map<String, Object>> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw);
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> kcKetangbiaoList = kcKetangbiaoService.pageMaps(page,qw);
return Result.OK(kcKetangbiaoList);
}
@ -293,13 +293,14 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-今日课堂上课中详情", notes="课堂管理-子表-今日课堂上课中详情")
@GetMapping(value = "/skzList")
public Result<?> 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<Map<String, Object>> kcKetangbiaoList = kcKetangbiaoService.listMaps(qw);
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> kcKetangbiaoList = kcKetangbiaoService.pageMaps(page,qw);
return Result.OK(kcKetangbiaoList);
}
@ -311,13 +312,14 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-已开课堂总数详情", notes="课堂管理-子表-已开课堂总数详情")
@GetMapping(value = "/ykktzsList")
public Result<?> 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<Map<String, Object>> kcKetangbiao3List = kcKetangbiaoService.listMaps(qw3);
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> kcKetangbiao3List = kcKetangbiaoService.pageMaps(page,qw3);
return Result.OK(kcKetangbiao3List);
}
@ -329,12 +331,13 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-已开课堂听课课堂详情", notes="课堂管理-子表-已开课堂听课课堂详情")
@GetMapping(value = "/ykkttkktList")
public Result<?> 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<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkktList(kcKetangbiao);
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkktList(page,kcKetangbiao);
return Result.OK(listTjIndex);
}
@ -346,12 +349,13 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-已开课堂听课课堂详情", notes="课堂管理-子表-已开课堂听课课堂详情")
@GetMapping(value = "/ykkttkrcList")
public Result<?> 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<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkrcList(kcKetangbiao);
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> listTjIndex = kcKetangbiaoService.getIndexYkktstjYkkttkrcList(page,kcKetangbiao);
return Result.OK(listTjIndex);
}
@ -363,9 +367,10 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-已开课堂听课课堂详情", notes="课堂管理-子表-已开课堂听课课堂详情")
@GetMapping(value = "/jrtkktsList")
public Result<?> jrtkktsList(String skrq) {
public Result<?> jrtkktsList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) {
//查询第三句-已开课堂听课课堂
List<Map<String, Object>> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtkktsList(skrq);
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtkktsList(page,skrq);
return Result.OK(kcKetangbiao2List);
}
@ -378,9 +383,10 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
*/
@ApiOperation(value="课堂管理-子表-已开课堂听课课堂详情", notes="课堂管理-子表-已开课堂听课课堂详情")
@GetMapping(value = "/jrtktkrcList")
public Result<?> jrtktkrcList(String skrq) {
public Result<?> jrtktkrcList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,String skrq) {
//查询第三句-已开课堂听课课堂
List<Map<String, Object>> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtktkrcList(skrq);
Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
IPage<Map<String, Object>> kcKetangbiao2List = kcKetangbiaoService.selectJrTkJrtktkrcList(page,skrq);
return Result.OK(kcKetangbiao2List);
}

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java
View File

@ -32,11 +32,11 @@ public interface KcKetangbiaoMapper extends BaseMapper<KcKetangbiao> {
void saveHis(KcKetangbiao kcKetangbiaohis);
List<Map<String, Object>> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao);
List<Map<String, Object>> getIndexYkktstjYkkttkktList(Page<Map<String, Object>> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao);
List<Map<String, Object>> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao);
List<Map<String, Object>> getIndexYkktstjYkkttkrcList(Page<Map<String, Object>> page, @Param(Constants.ENTITY) KcKetangbiao kcKetangbiao);
List<Map<String, Object>> selectJrTkJrtkktsList(String skrq);
List<Map<String, Object>> selectJrTkJrtkktsList(Page<Map<String, Object>> page, @Param("skrq") String skrq);
List<Map<String, Object>> selectJrTkJrtktkrcList(String skrq);
List<Map<String, Object>> selectJrTkJrtktkrcList(Page<Map<String, Object>> page, @Param("skrq") String skrq);
}

16
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml
View File

@ -142,11 +142,11 @@
*
FROM kc_ketangbiao k, kc_tingke t WHERE k.id = t.kechengbiaoid
and t.tingketime > '1'
<if test="startTime != '' and startTime != null">
AND skrq >= #{startTime}
<if test="et.startTime != '' and et.startTime != null">
AND skrq >= #{et.startTime}
</if>
<if test="endTime != '' and endTime != null">
AND skrq &lt;= #{endTime}
<if test="et.endTime != '' and et.endTime != null">
AND skrq &lt;= #{et.endTime}
</if>
</select>
@ -155,11 +155,11 @@
*
FROM kc_ketangbiao k, kc_tingke t WHERE k.id = t.kechengbiaoid
and t.tingketime > '1'
<if test="startTime != '' and startTime != null">
AND skrq >= #{startTime}
<if test="et.startTime != '' and et.startTime != null">
AND skrq >= #{et.startTime}
</if>
<if test="endTime != '' and endTime != null">
AND skrq &lt;= #{endTime}
<if test="et.endTime != '' and et.endTime != null">
AND skrq &lt;= #{et.endTime}
</if>
</select>

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java
View File

@ -33,11 +33,11 @@ public interface IKcKetangbiaoService extends IService<KcKetangbiao> {
*/
void saveHis(KcKetangbiao kcKetangbiaohis);
List<Map<String, Object>> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao);
IPage<Map<String, Object>> getIndexYkktstjYkkttkktList(Page<Map<String, Object>> page,KcKetangbiao kcKetangbiao);
List<Map<String, Object>> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao);
IPage<Map<String, Object>> getIndexYkktstjYkkttkrcList(Page<Map<String, Object>> page,KcKetangbiao kcKetangbiao);
List<Map<String, Object>> selectJrTkJrtkktsList(String skrq);
IPage<Map<String, Object>> selectJrTkJrtkktsList(Page<Map<String, Object>> page,String skrq);
List<Map<String, Object>> selectJrTkJrtktkrcList(String skrq);
IPage<Map<String, Object>> selectJrTkJrtktkrcList(Page<Map<String, Object>> page,String skrq);
}

16
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java
View File

@ -53,22 +53,22 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl<KcKetangbiaoMapper, KcK
}
@Override
public List<Map<String, Object>> getIndexYkktstjYkkttkktList(KcKetangbiao kcKetangbiao) {
return baseMapper.getIndexYkktstjYkkttkktList(kcKetangbiao);
public IPage<Map<String, Object>> getIndexYkktstjYkkttkktList(Page<Map<String, Object>> page, KcKetangbiao kcKetangbiao) {
return page.setRecords(baseMapper.getIndexYkktstjYkkttkktList(page, kcKetangbiao));
}
@Override
public List<Map<String, Object>> getIndexYkktstjYkkttkrcList(KcKetangbiao kcKetangbiao) {
return baseMapper.getIndexYkktstjYkkttkrcList(kcKetangbiao);
public IPage<Map<String, Object>> getIndexYkktstjYkkttkrcList(Page<Map<String, Object>> page, KcKetangbiao kcKetangbiao) {
return page.setRecords(baseMapper.getIndexYkktstjYkkttkrcList(page, kcKetangbiao));
}
@Override
public List<Map<String, Object>> selectJrTkJrtkktsList(String skrq) {
return baseMapper.selectJrTkJrtkktsList(skrq);
public IPage<Map<String, Object>> selectJrTkJrtkktsList(Page<Map<String, Object>> page, String skrq) {
return page.setRecords(baseMapper.selectJrTkJrtkktsList(page, skrq));
}
@Override
public List<Map<String, Object>> selectJrTkJrtktkrcList(String skrq) {
return baseMapper.selectJrTkJrtktkrcList(skrq);
public IPage<Map<String, Object>> selectJrTkJrtktkrcList(Page<Map<String, Object>> page, String skrq) {
return page.setRecords(baseMapper.selectJrTkJrtktkrcList(page, skrq));
}
}