2023年6月14日 修复统计的搜索条件
This commit is contained in:
parent
20cbcc4794
commit
eabf546972
|
@ -32,6 +32,7 @@ import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @Description: 调查问卷-答案表
|
* @Description: 调查问卷-答案表
|
||||||
|
@ -67,7 +68,31 @@ public class TingKeStatisticsController{
|
||||||
QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper(evaluation, req.getParameterMap());
|
QueryWrapper<KcEvaluation> queryWrapper = QueryGenerator.initQueryWrapper(evaluation, req.getParameterMap());
|
||||||
queryWrapper.isNotNull("upuserid");
|
queryWrapper.isNotNull("upuserid");
|
||||||
queryWrapper.isNotNull("minkcid");
|
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);
|
IPage<KcEvaluation> pageList = kcEvaluationService.page(page, queryWrapper);
|
||||||
|
|
||||||
//---------------------补数据1------------------------------------------
|
//---------------------补数据1------------------------------------------
|
||||||
|
@ -87,19 +112,11 @@ public class TingKeStatisticsController{
|
||||||
String xuserId = String.valueOf(ixuserId);
|
String xuserId = String.valueOf(ixuserId);
|
||||||
tjSet.add(xuserId);
|
tjSet.add(xuserId);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if(tjSet.isEmpty()){
|
||||||
|
return Result.OK(new Page<>());
|
||||||
|
}
|
||||||
//---------------------补数据2------------------------------------------
|
//---------------------补数据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<>();
|
QueryWrapper<KcTksfrzb> tksfQw = new QueryWrapper<>();
|
||||||
|
|
8
pom.xml
8
pom.xml
|
@ -138,10 +138,10 @@
|
||||||
<artifactId>pegdown</artifactId>
|
<artifactId>pegdown</artifactId>
|
||||||
<version>${pegdown.version}</version>
|
<version>${pegdown.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<!-- <dependency>-->
|
||||||
<groupId>org.jeecgframework.boot</groupId>
|
<!-- <groupId>org.jeecgframework.boot</groupId>-->
|
||||||
<artifactId>jeecg-boot-base-core</artifactId>
|
<!-- <artifactId>jeecg-boot-base-core</artifactId>-->
|
||||||
</dependency>
|
<!-- </dependency>-->
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue