From 72cbc344610bf0bb56603c82ab01393622800177 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Sun, 25 Jun 2023 23:36:35 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8825=E6=97=A5=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TingKeStatisticsController.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) 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 91e74c68..9f1a155d 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 @@ -88,6 +88,7 @@ public class TingKeStatisticsController { queryWrapper.like(StringUtils.isNotBlank(evaluation.getSkjgh()),"kt.jgh",evaluation.getSkjgh()); queryWrapper.like(StringUtils.isNotBlank(evaluation.getUpuseridLike()),"a.upuserid",evaluation.getUpuseridLike()); queryWrapper.like(StringUtils.isNotBlank(evaluation.getUpUserName()),"a.upuser",evaluation.getUpUserName()); + queryWrapper.like(StringUtils.isNotBlank(evaluation.getTkdwmc()),"xu.DWMC",evaluation.getTkdwmc()); @@ -114,6 +115,19 @@ public class TingKeStatisticsController { // queryWrapper.ge("a.up_date",xqxnHistory.getStartTime()); // queryWrapper.le("a.up_date",xqxnHistory.getEndTime()); } + + //按听课身份查询 + if(StringUtils.isNotBlank(evaluation.getTksf())){ + QueryWrapper tksfSerachQw = new QueryWrapper<>(); + tksfSerachQw.in("kc_tksfrzb.ZWMC",evaluation.getTksf()); + List tksfGhList = kcTksfrzbService.list(tksfSerachQw); + if(tksfGhList != null && !tksfGhList.isEmpty()){ + Set ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet()); + queryWrapper.in("a.upuserid",ghSet); + }else{ + queryWrapper.eq("a.upuserid","-1"); + } + } IPage pageList = service.selectPageAndKcmc(page, queryWrapper); //---------------------补数据1------------------------------------------ Map sourceDictMap = Maps.newHashMap(); @@ -235,6 +249,18 @@ public class TingKeStatisticsController { queryWrapper.le("a.up_date",xqxnHistory.getEndTime()); } } + //按听课身份查询 + if(StringUtils.isNotBlank(evaluation.getTksf())){ + QueryWrapper tksfSerachQw = new QueryWrapper<>(); + tksfSerachQw.in("kc_tksfrzb.ZWMC",evaluation.getTksf()); + List tksfGhList = kcTksfrzbService.list(tksfSerachQw); + if(tksfGhList != null && !tksfGhList.isEmpty()){ + Set ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet()); + queryWrapper.in("a.upuserid",ghSet); + }else{ + queryWrapper.eq("a.upuserid","-1"); + } + } IPage pageList = service.selectPageAndKcmc2(page, queryWrapper); //---------------------补数据1------------------------------------------ Map sourceDictMap = Maps.newHashMap();