From da6a7c744cfebf10b1b90f29e67226e07983a343 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Wed, 28 Jun 2023 00:08:56 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8828=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SynchronizationService/SyncTJwXsxkb.java | 6 ++-- .../modules/kc/statistics/KcEvaluationVo.java | 3 ++ .../kc/statistics/KcEvaluationVo2.java | 3 ++ .../TingKeStatisticsController.java | 28 +++++++++++++++++-- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java index 768a0cc4..211f4a79 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTJwXsxkb.java @@ -57,19 +57,19 @@ public class SyncTJwXsxkb extends BaseSync { boolean isAll = false; boolean isScope = false; if(param != null){ - if(param.containsKey("isAll")){ + if(param.containsKey("isAll")){//同步全部 String isAllStr = (String)param.get("isAll"); if(StringUtils.isNotBlank(isAllStr)){ isAll = Boolean.parseBoolean(isAllStr); } } - if(param.containsKey("now")){ + if(param.containsKey("now")){//按照此时间同步 String keyStr = (String)param.get("now"); if(StringUtils.isNotBlank(keyStr)){ now = DateUtil.parse(keyStr, "yyyy-MM-dd"); } } - if(param.containsKey("isScope")){//按照范围 + if(param.containsKey("isScope")){//按照范围同步 String isScopeStr = (String)param.get("isScope"); if(StringUtils.isNotBlank(isScopeStr)){ isScope = Boolean.parseBoolean(isScopeStr); 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 6b7e0042..8f184c54 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 @@ -155,6 +155,9 @@ public class KcEvaluationVo implements Serializable { @TableField(exist = false) private String tksf; + @TableField(exist = false) + private String tksfLike; + @Excel(name = "听课评价结果（5分制）", width = 15) @TableField(exist = false) private String tkpjjg; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo2.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo2.java index 29299307..4e8a0adf 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo2.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/KcEvaluationVo2.java @@ -153,6 +153,9 @@ public class KcEvaluationVo2 implements Serializable{ @TableField(exist = false) private String tksf; + @TableField(exist = false) + private String tksfLike; + // @Excel(name = "听课评价结果（5分制）", width = 15) @TableField(exist = false) private String tkpjjg; 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 9e56b7cc..289cabc9 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 @@ -119,7 +119,19 @@ public class TingKeStatisticsController { //按听课身份查询 if(StringUtils.isNotBlank(evaluation.getTksf())){ QueryWrapper tksfSerachQw = new QueryWrapper<>(); - tksfSerachQw.in("kc_tksfrzb.ZWMC",evaluation.getTksf()); + tksfSerachQw.eq("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"); + } + } + //按听课身份模糊查询 + if(StringUtils.isNotBlank(evaluation.getTksfLike())){ + QueryWrapper tksfSerachQw = new QueryWrapper<>(); + tksfSerachQw.like("kc_tksfrzb.ZWMC",evaluation.getTksfLike()); List tksfGhList = kcTksfrzbService.list(tksfSerachQw); if(tksfGhList != null && !tksfGhList.isEmpty()){ Set ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet()); @@ -252,7 +264,19 @@ public class TingKeStatisticsController { //按听课身份查询 if(StringUtils.isNotBlank(evaluation.getTksf())){ QueryWrapper tksfSerachQw = new QueryWrapper<>(); - tksfSerachQw.in("kc_tksfrzb.ZWMC",evaluation.getTksf()); + tksfSerachQw.eq("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"); + } + } + //按听课身份模糊查询 + if(StringUtils.isNotBlank(evaluation.getTksfLike())){ + QueryWrapper tksfSerachQw = new QueryWrapper<>(); + tksfSerachQw.like("kc_tksfrzb.ZWMC",evaluation.getTksfLike()); List tksfGhList = kcTksfrzbService.list(tksfSerachQw); if(tksfGhList != null && !tksfGhList.isEmpty()){ Set ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet());