yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023年6月25日 新增筛选

This commit is contained in:
bai 2023-06-25 23:36:35 +08:00
parent ec75b3de91
commit 72cbc34461
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jeecg-module-main/src/main/java/org/jeecg/modules/kc/statistics/TingKeStatisticsController.java
View File

@ -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<KcTksfrzb> tksfSerachQw = new QueryWrapper<>();
tksfSerachQw.in("kc_tksfrzb.ZWMC",evaluation.getTksf());
List<KcTksfrzb> tksfGhList = kcTksfrzbService.list(tksfSerachQw);
if(tksfGhList != null && !tksfGhList.isEmpty()){
Set<String> ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
queryWrapper.in("a.upuserid",ghSet);
}else{
queryWrapper.eq("a.upuserid","-1");
}
}
IPage<KcEvaluationVo> pageList = service.selectPageAndKcmc(page, queryWrapper);
//---------------------补数据1------------------------------------------
Map<Integer,String> sourceDictMap = Maps.newHashMap();
@ -235,6 +249,18 @@ public class TingKeStatisticsController {
queryWrapper.le("a.up_date",xqxnHistory.getEndTime());
}
}
//按听课身份查询
if(StringUtils.isNotBlank(evaluation.getTksf())){
QueryWrapper<KcTksfrzb> tksfSerachQw = new QueryWrapper<>();
tksfSerachQw.in("kc_tksfrzb.ZWMC",evaluation.getTksf());
List<KcTksfrzb> tksfGhList = kcTksfrzbService.list(tksfSerachQw);
if(tksfGhList != null && !tksfGhList.isEmpty()){
Set<String> ghSet = tksfGhList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
queryWrapper.in("a.upuserid",ghSet);
}else{
queryWrapper.eq("a.upuserid","-1");
}
}
IPage<KcEvaluationVo2> pageList = service.selectPageAndKcmc2(page, queryWrapper);
//---------------------补数据1------------------------------------------
Map<Integer,String> sourceDictMap = Maps.newHashMap();