修改bug
This commit is contained in:
parent
538c7310d1
commit
f3d8b7f43e
|
@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
import org.jeecg.common.system.query.QueryGenerator;
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
import org.jeecg.common.util.oConvertUtils;
|
import org.jeecg.common.util.oConvertUtils;
|
||||||
|
@ -67,6 +69,10 @@ public class KcEvaluationsStatController extends JeecgController<KcEvaluationsSt
|
||||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
HttpServletRequest req) {
|
HttpServletRequest req) {
|
||||||
|
if(StringUtils.isNotBlank(kcEvaluationsStat.getCol13())){
|
||||||
|
kcEvaluationsStat.setCol13("*"+kcEvaluationsStat.getCol13()+"*");
|
||||||
|
}
|
||||||
|
|
||||||
QueryWrapper<KcEvaluationsStat> queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluationsStat, req.getParameterMap());
|
QueryWrapper<KcEvaluationsStat> queryWrapper = QueryGenerator.initQueryWrapper(kcEvaluationsStat, req.getParameterMap());
|
||||||
Page<KcEvaluationsStat> page = new Page<KcEvaluationsStat>(pageNo, pageSize);
|
Page<KcEvaluationsStat> page = new Page<KcEvaluationsStat>(pageNo, pageSize);
|
||||||
IPage<KcEvaluationsStat> pageList = kcEvaluationsStatService.page(page, queryWrapper);
|
IPage<KcEvaluationsStat> pageList = kcEvaluationsStatService.page(page, queryWrapper);
|
||||||
|
|
|
@ -207,6 +207,7 @@ public class TingKeStatisticsController {
|
||||||
//查询听课身份
|
//查询听课身份
|
||||||
QueryWrapper<KcExportConfigTpkwcqkjzglx> tksfQw = new QueryWrapper<>();
|
QueryWrapper<KcExportConfigTpkwcqkjzglx> tksfQw = new QueryWrapper<>();
|
||||||
tksfQw.in("gh",tjSet);
|
tksfQw.in("gh",tjSet);
|
||||||
|
tksfQw.groupBy("tklx");
|
||||||
List<KcExportConfigTpkwcqkjzglx> tksfList = kcExportConfigTpkwcqkjzglxService.list(tksfQw);
|
List<KcExportConfigTpkwcqkjzglx> tksfList = kcExportConfigTpkwcqkjzglxService.list(tksfQw);
|
||||||
Map<String, KcExportConfigTpkwcqkjzglx> tksfMap = Maps.newHashMap();
|
Map<String, KcExportConfigTpkwcqkjzglx> tksfMap = Maps.newHashMap();
|
||||||
tksfList.forEach(x -> {
|
tksfList.forEach(x -> {
|
||||||
|
|
Loading…
Reference in New Issue