From 4ec147ce06db4a67b954844d87491dad88969725 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Mon, 24 Jul 2023 00:30:31 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B47=E6=9C=8824=E6=97=A5=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3,=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/kc/config/export/Export.java | 11 +++- .../controller/KcKetangbiaoController.java | 63 +++++++++++++++++-- .../modules/kc/ktgl/entity/KcKetangbiao.java | 3 + .../kc/ktgl/mapper/KcKetangbiaoMapper.java | 3 + .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 8 +++ .../kc/ktgl/service/IKcKetangbiaoService.java | 2 + .../service/impl/KcKetangbiaoServiceImpl.java | 5 ++ .../qa/controller/KcEvaluationController.java | 1 + 8 files changed, 89 insertions(+), 7 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java index becb683f..cb5cabe2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java @@ -102,6 +102,7 @@ public class Export extends BaseExport { KcXqxnHistory common = changeTingKeTongJi.getXqConfig(xqxnParam); + //默认取最大的学期 if(StringUtils.isBlank(xqxnParam)){ xqxnParam = common.getTitle(); } @@ -158,9 +159,9 @@ public class Export extends BaseExport { //********************************通用*************************************************************/ result.put("xqxn",xqxnParam); //填进去数量 - result.put("oneListSize", String.valueOf(oneList.size())); - result.put("twoListSize", String.valueOf(twoList.size())); - result.put("threeListSize", String.valueOf(threeList.size())); + result.put("oneListSize", StringUtils.defaultString(String.valueOf(oneList.size()),"0")); + result.put("twoListSize", StringUtils.defaultString(String.valueOf(twoList.size()),"0")); + result.put("threeListSize", StringUtils.defaultString(String.valueOf(threeList.size()),"0")); //********************************表头END**********************************************************/ wo.replaceTextPlus(result); @@ -179,9 +180,11 @@ public class Export extends BaseExport { } }); index = 4; + WordOperator.fillNullCall(mainList,oneList,2,3); //从固定位置开始添加（1为第二个表格，第二个1为固定位置） wo.insert2Table(0, index, true, mainList); + index += mainList.size() + 2; mainList.clear(); twoList.forEach(x -> { @@ -195,6 +198,7 @@ public class Export extends BaseExport { } }); //从固定位置开始添加（1为第二个表格，第二个1为固定位置） + WordOperator.fillNullCall(mainList,twoList,2,3); wo.insert2Table(0, index, true, mainList); index += mainList.size() + 2; @@ -210,6 +214,7 @@ public class Export extends BaseExport { } }); //从固定位置开始添加（1为第二个表格，第二个1为固定位置） + WordOperator.fillNullCall(mainList,threeList,2,3); wo.insert2Table(0, index, true, mainList); return wo; } 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 aadd6f0d..38aa7bfe 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 @@ -1,9 +1,6 @@ package org.jeecg.modules.kc.ktgl.controller; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -16,6 +13,7 @@ import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.beust.jcommander.internal.Sets; import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.CommonAPI; @@ -75,6 +73,7 @@ public class KcKetangbiaoController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap()); + //查本学期学年的 + if(kcKetangbiao.isSearchByNowXqxn()){ + queryWrapper.ge("skrq",getBxqStartTime());//<= + queryWrapper.le("skrq",getBxqEndTime());//>= + } queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')"); queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs()); Page page = new Page(pageNo, pageSize); IPage pageList = kcKetangbiaoService.page(page, queryWrapper); return Result.OK(pageList); } + + /** + * 分页列表查询 + * + * @param kcKetangbiao + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "课堂管理-子表-分页列表查询") + @ApiOperation(value="课堂管理-子表-分页列表查询", notes="课堂管理-子表-分页列表查询") + @GetMapping(value = "/fundAllPjjgList") + public Result> fundAllPjjgList(KcKetangbiao kcKetangbiao, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap()); + //查本学期学年的 + if(kcKetangbiao.isSearchByNowXqxn()){ + queryWrapper.ge("skrq",getBxqStartTime());//<= + queryWrapper.le("skrq",getBxqEndTime());//>= + } + queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')"); + queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs()); + Page page = new Page(pageNo, pageSize); + + Set idSet = Sets.newHashSet(); + IPage pageList = kcKetangbiaoService.fundAllPjjgList(page, queryWrapper); + pageList.getRecords().forEach(x -> idSet.add(x.getId())); + //查询平均分 + + //查询教师平均分 + + + //查询学生平均分 + + + return Result.OK(pageList); + } + + /** * 添加 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java index 18dd86ea..211c45d1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/entity/KcKetangbiao.java @@ -288,4 +288,7 @@ public class KcKetangbiao implements Serializable { @TableField(exist = false) private String szkc; + @TableField(exist = false) + private boolean searchByNowXqxn; + } 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 b20acead..280d9cc9 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,5 +1,6 @@ package org.jeecg.modules.kc.ktgl.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -47,4 +48,6 @@ public interface KcKetangbiaoMapper extends BaseMapper { List> getTeacheryskc(Map queryMap); List> getTeacherjlrkcb(Map queryMap); + + IPage fundAllPjjgList(Page page, @Param(Constants.ENTITY) QueryWrapper queryWrapper); } 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 3aff3323..38812e0c 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 @@ -545,5 +545,13 @@ ) a LEFT JOIN zongtipingjiapingjunfen b ON a.kechengbiaoid = b.kechengbiaoid + \ 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 44801aa7..e878a39d 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 @@ -50,4 +50,6 @@ public interface IKcKetangbiaoService extends IService { List> getTeacheryskc(Map queryMap); List> getTeacherjlrkcb(Map queryMap); + + IPage fundAllPjjgList(Page page, QueryWrapper queryWrapper); } 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 7d8099f7..03cdacd1 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 @@ -96,4 +96,9 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl> getTeacherjlrkcb(Map queryMap) { return baseMapper.getTeacherjlrkcb(queryMap); } + + @Override + public IPage fundAllPjjgList(Page page, QueryWrapper queryWrapper) { + return baseMapper.fundAllPjjgList(page,queryWrapper); + } } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java index 942fdcdf..eddc07d4 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/controller/KcEvaluationController.java @@ -413,6 +413,7 @@ public class KcEvaluationController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper("a",kcEvaluation, req.getParameterMap()); + queryWrapper.eq(StringUtils.isNotBlank(kcEvaluation.getJgh()),"kt.jgh",kcEvaluation.getJgh()); queryWrapper.eq("eq.genre",0); // queryWrapper.eq("a.upuserid",); queryWrapper.orderByDesc("a.up_timestamp");