From 76d15352d5dbf46886a8579df14fcc271fc3b305 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Fri, 11 Aug 2023 01:24:01 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8811=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KcExportConfigTpkwcqkjzglxController.java | 42 +++++++++++++++++-- .../entity/KcExportConfigTpkwcqkjzglx.java | 12 ++++++ .../modules/kc/statistics/KcEvaluationVo.java | 15 +++++++ .../TingKeStatisticsController.java | 21 ++++++++++ 4 files changed, 86 insertions(+), 4 deletions(-) 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 3378f0cd..9c0e79a4 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 @@ -3,6 +3,7 @@ package org.jeecg.modules.kc.config.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.google.common.collect.Maps; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -15,7 +16,11 @@ import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.modules.kc.config.entity.KcExportConfigTpkwcqkjzglx; import org.jeecg.modules.kc.config.export.Export; import org.jeecg.modules.kc.config.service.IKcExportConfigTpkwcqkjzglxService; +import org.jeecg.modules.kc.grab.SynchronizationService.tools.ChangeTingKeTongJi; import org.jeecg.modules.kc.grab.imports.service.IXxhbuserService; +import org.jeecg.modules.kc.kcXqxnHistory.entity.KcXqxnHistory; +import org.jeecg.modules.kc.tksf.kctkcstj.entity.KcTkcstj; +import org.jeecg.modules.kc.tksf.kctkcstj.service.IKcTkcstjService; import org.jeecg.modules.tools.word.ExportWord; import org.jeecg.modules.tools.word.WordOperator; import org.springframework.beans.factory.annotation.Autowired; @@ -25,8 +30,10 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.List; +import java.util.Map; - /** +/** * @Description: kc_export_config_tpkwcqkjzglx * @Author: jeecg-boot * @Date: 2023-07-21 @@ -42,8 +49,14 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(kcExportConfigTpkwcqkjzglx, req.getParameterMap()); // queryWrapper.eq(StringUtils.isNotBlank(kcExportConfigTpkwcqkjzglx.getDwmc()),"b.dwmc",kcExportConfigTpkwcqkjzglx.getDwmc()); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = kcExportConfigTpkwcqkjzglxService.page(page, queryWrapper); + //根据当前学期学年，硬合并出来一个数据 + QueryWrapper tjQw = new QueryWrapper<>(); + KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(kcExportConfigTpkwcqkjzglx.getXqxn()); + tjQw.eq("xnxq",kcXqxnHistory.getTitle()); + List tjList = kcTkcstjService.list(tjQw); + Map tjMap = Maps.newHashMap(); + tjList.forEach(x -> { + tjMap.put(x.getJgh(),x); + }); + + pageList.getRecords().forEach(x -> { + x.setTkxttj("0"); + x.setYskcs("0"); + if(tjMap.containsKey(x.getGh())){ + KcTkcstj tkcstj = tjMap.get(x.getGh()); + x.setTkxttj(tkcstj.getTkxttj()); + x.setYskcs(tkcstj.getYskcs()); + } + }); + + return Result.OK(pageList); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java index c6eca3cd..722341f5 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/entity/KcExportConfigTpkwcqkjzglx.java @@ -88,4 +88,16 @@ public class KcExportConfigTpkwcqkjzglx implements Serializable { @TableField(exist = false) private String zwmc; + /**学期学年*/ + @TableField(exist = false) + private String xqxn; + + /**应听课次数*/ + @TableField(exist = false) + private java.lang.String yskcs; + /**听课次数*/ + @TableField(exist = false) + private java.lang.String tkxttj; + + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo.java index 2fcecfbd..c911d0fa 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo.java @@ -178,4 +178,19 @@ public class KcEvaluationVo implements Serializable { @TableField(exist = false) private String upUserName; + @TableField(exist = false) + private String findGh; + + /** + * 按当前用户的部门查询评课 + */ + @TableField(exist = false) + private boolean findByPkdwmc; + + /** + * 按当前用户的部门查询被评课 + */ + @TableField(exist = false) + private boolean findByBeiTkkdwmc; + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java index 93408962..4233be98 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java @@ -86,6 +86,27 @@ public class TingKeStatisticsController { public IPage loadPageData(KcEvaluationVo evaluation,QueryWrapper queryWrapper,Page page){ + + //查询当前用户的学院 + if(evaluation.isFindByPkdwmc() || evaluation.isFindByBeiTkkdwmc()){ + QueryWrapper uqw = new QueryWrapper<>(); + //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + uqw.eq("gh",evaluation.getFindGh()); + uqw.last("limit 1"); + KcExportConfigTpkwcqkjzglx exportConfigTpkwcqkjzglx = kcExportConfigTpkwcqkjzglxService.getOne(uqw); + if(exportConfigTpkwcqkjzglx == null) { + return new Page<>(); + } + //queryWrapper.eq() + if(evaluation.isFindByPkdwmc()){ + queryWrapper.eq("xu.DWMC",exportConfigTpkwcqkjzglx.getDwmc()); + } + if(evaluation.isFindByBeiTkkdwmc()){ + queryWrapper.eq("kt.kkdw ",exportConfigTpkwcqkjzglx.getDwmc()); + } + } + + queryWrapper.isNotNull("a.upuserid"); queryWrapper.isNotNull("a.minkcid");