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 33871c64..86101023 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 @@ -32,6 +32,7 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; /** * @Description: 调查问卷-答案表 @@ -67,7 +68,31 @@ public class TingKeStatisticsController{ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(evaluation, req.getParameterMap()); queryWrapper.isNotNull("upuserid"); queryWrapper.isNotNull("minkcid"); - Page page = new Page(pageNo, pageSize); + + List kcXqxnHistoryList = kcXqxnHistoryService.list(); + //查询所在单位 + List szdwList = xxhbuserService.list(); + Map szdwMap = Maps.newHashMap(); + szdwList.forEach(x -> { + szdwMap.put(x.getGh(),x); + }); + + //补充搜索 + if(StringUtils.isNotBlank(evaluation.getXqxn())){ + List xqxnHistoryList = kcXqxnHistoryList.stream().filter(x -> StringUtils.equals(x.getTitle(),evaluation.getXqxn())).collect(Collectors.toList()); + if(xqxnHistoryList != null && !xqxnHistoryList.isEmpty()){ + KcXqxnHistory xqxnHistory = xqxnHistoryList.get(0); + queryWrapper.ge("up_date",xqxnHistory.getStartTime()); + queryWrapper.le("up_date",xqxnHistory.getEndTime()); + } + } + if(StringUtils.isNotBlank(evaluation.getDwmc())){ + List xxhbuserList = szdwList.stream().filter(x -> StringUtils.equals(x.getDwh(),evaluation.getDwmc())).collect(Collectors.toList()); + Set ghSet = xxhbuserList.stream().map(x -> x.getGh()).collect(Collectors.toSet()); + queryWrapper.in("upuserid",ghSet); + } + + Page page = new Page<>(pageNo, pageSize); IPage pageList = kcEvaluationService.page(page, queryWrapper); //---------------------补数据1------------------------------------------ @@ -87,19 +112,11 @@ public class TingKeStatisticsController{ String xuserId = String.valueOf(ixuserId); tjSet.add(xuserId); }); + + if(tjSet.isEmpty()){ + return Result.OK(new Page<>()); + } //---------------------补数据2------------------------------------------ - //查询所在单位 - QueryWrapper szdwQw = new QueryWrapper<>(); - szdwQw.in("gh",tjSet); - List szdwList = xxhbuserService.list(szdwQw); - Map szdwMap = Maps.newHashMap(); - szdwList.forEach(x -> { - szdwMap.put(x.getGh(),x); - }); - - -// QueryWrapper kcXqxnHistoryQueryWrapper = new QueryWrapper(); - List kcXqxnHistoryList = kcXqxnHistoryService.list(); //查询听课身份 QueryWrapper tksfQw = new QueryWrapper<>(); diff --git a/pom.xml b/pom.xml index ef523826..a98c0338 100644 --- a/pom.xml +++ b/pom.xml @@ -138,10 +138,10 @@ pegdown ${pegdown.version} - - org.jeecgframework.boot - jeecg-boot-base-core - + + + +