diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java index 4d24fd61..15282ac3 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java @@ -77,6 +77,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController kcEvaluationQueryWrapper = new QueryWrapper<>(); + kcEvaluationQueryWrapper.in("kt.xnxq",xqxnSet); + kcEvaluationQueryWrapper.groupBy("concat(xnxq,'-',upuserid)"); + kcEvaluationQueryWrapper.orderByDesc("kt.skrq"); + List pktjList = kcEvaluationService.findTj(kcEvaluationQueryWrapper); + Map pktjMap = Maps.newHashMap(); + pktjList.forEach(x -> { + pktjMap.put(x.getXnxq() + "-" + x.getUpuserid(),x); + }); + //------------评课统计---2024-02-29新增的------------------- + //根据当前学期学年,硬合并出来一个数据 exportList.forEach(x -> { x.setTkxttj("0"); x.setYskcs("0"); if(tjMap.containsKey(x.getXqxn() + "-" + x.getGh())){ KcTkcstj tkcstj = tjMap.get(x.getXqxn() + "-" + x.getGh()); - x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0")); +// x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0")); x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0")); //x.setXqxn(kcXqxnHistory.getTitle()); } + //------------评课统计---2024-02-29新增的------------------- + if(pktjMap.containsKey(x.getXqxn() + "-" + x.getGh())){ + KcEvaluation pkcstj = pktjMap.get(x.getXqxn() + "-" + x.getGh()); + x.setTkxttj(StringUtils.defaultString(pkcstj.getPkNum()+"","0")); + } + //------------评课统计---2024-02-29新增的------------------- }); + // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); //此处设置的filename无效 ,前端会重更新设置一下 diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java index 5071859c..009f0fae 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/mapper/KcEvaluationMapper.java @@ -44,4 +44,6 @@ public interface KcEvaluationMapper extends BaseMapper { List findTj(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); KcBdgxbcopy getOpenId(String skjs); + + List getCountlist(KcEvaluation kcEvaluation); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java index 24569ea6..d8eded5e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/IKcEvaluationService.java @@ -42,4 +42,6 @@ public interface IKcEvaluationService extends IService { IPage queryPkZuJiPage(Page page, QueryWrapper queryWrapper); List findTj(QueryWrapper queryWrapper); + + List getCountlist(KcEvaluation kcEvaluation); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java index 76309922..b8e410d7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/service/impl/KcEvaluationServiceImpl.java @@ -155,6 +155,11 @@ public class KcEvaluationServiceImpl extends ServiceImpl getCountlist(KcEvaluation kcEvaluation) { + return baseMapper.getCountlist(kcEvaluation); + } + // appId private static final String appId = "wx59920eb69d611d7f";//东师