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

2023年6月14日 修复统计的搜索条件

This commit is contained in:
bai 2023-06-14 09:27:31 +08:00
parent 20cbcc4794
commit eabf546972
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper(evaluation, req.getParameterMap());
queryWrapper.isNotNull("upuserid");
queryWrapper.isNotNull("minkcid");
Page<KcEvaluation> page = new Page<KcEvaluation>(pageNo, pageSize);
List<KcXqxnHistory> kcXqxnHistoryList = kcXqxnHistoryService.list();
//查询所在单位
List<Xxhbuser> szdwList = xxhbuserService.list();
Map<String, Xxhbuser> szdwMap = Maps.newHashMap();
szdwList.forEach(x -> {
szdwMap.put(x.getGh(),x);
});
//补充搜索
if(StringUtils.isNotBlank(evaluation.getXqxn())){
List<KcXqxnHistory> 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<Xxhbuser> xxhbuserList = szdwList.stream().filter(x -> StringUtils.equals(x.getDwh(),evaluation.getDwmc())).collect(Collectors.toList());
Set<String> ghSet = xxhbuserList.stream().map(x -> x.getGh()).collect(Collectors.toSet());
queryWrapper.in("upuserid",ghSet);
}
Page<KcEvaluation> page = new Page<>(pageNo, pageSize);
IPage<KcEvaluation> 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<Xxhbuser> szdwQw = new QueryWrapper<>();
szdwQw.in("gh",tjSet);
List<Xxhbuser> szdwList = xxhbuserService.list(szdwQw);
Map<String, Xxhbuser> szdwMap = Maps.newHashMap();
szdwList.forEach(x -> {
szdwMap.put(x.getGh(),x);
});
// QueryWrapper<KcXqxnHistory> kcXqxnHistoryQueryWrapper = new QueryWrapper<KcXqxnHistory>();
List<KcXqxnHistory> kcXqxnHistoryList = kcXqxnHistoryService.list();
//查询听课身份
QueryWrapper<KcTksfrzb> tksfQw = new QueryWrapper<>();

8
pom.xml
View File

@ -138,10 +138,10 @@
<artifactId>pegdown</artifactId>
<version>${pegdown.version}</version>
</dependency>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
<artifactId>jeecg-boot-base-core</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.jeecgframework.boot</groupId>-->
<!-- <artifactId>jeecg-boot-base-core</artifactId>-->
<!-- </dependency>-->
</dependencies>