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

2023年8月29日 修复导出与列表查询的数据不一致的问题

This commit is contained in:
bai 2023-08-29 14:39:54 +08:00
parent b9e2063513
commit 20bba074c1
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
View File

@ -280,15 +280,8 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
List<KcExportConfigTpkwcqkjzglx> exportList = service.list(queryWrapper);
Set<String> xqxnSet = exportList.stream().filter(x -> StringUtils.isNotBlank(x.getXqxn())).map(KcExportConfigTpkwcqkjzglx::getXqxn).collect(Collectors.toSet());
//根据当前学期学年，硬合并出来一个数据
QueryWrapper<KcTkcstj> tjQw = new QueryWrapper<>();
// KcXqxnHistory kcXqxnHistory = changeTingKeTongJi.getXqConfig(object.getXqxn());
// if(kcXqxnHistory == null){
// exportList = Lists.newArrayList();
// }
// tjQw.eq("xnxq",kcXqxnHistory.getTitle());
// tjQw.eq("xnxq",object.getXqxn());
if(xqxnSet.isEmpty()){
tjQw.eq("xnxq",-1);
}else{
@ -297,9 +290,10 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
List<KcTkcstj> tjList = kcTkcstjService.list(tjQw);
Map<String,KcTkcstj> tjMap = Maps.newHashMap();
tjList.forEach(x -> {
tjMap.put(x.getJgh(),x);
tjMap.put(x.getXnxq() + "-" + x.getJgh(),x);
});
//根据当前学期学年，硬合并出来一个数据
exportList.forEach(x -> {
x.setTkxttj("0");
x.setYskcs("0");
@ -307,9 +301,9 @@ public class KcExportConfigTpkwcqkjzglxController extends JeecgController<KcExpo
KcTkcstj tkcstj = tjMap.get(x.getXqxn() + "-" + x.getGh());
x.setTkxttj(StringUtils.defaultString(tkcstj.getTkxttj(),"0"));
x.setYskcs(StringUtils.defaultString(tkcstj.getYskcs(),"0"));
//x.setXqxn(kcXqxnHistory.getTitle());
}
});
// Step.3 AutoPoi 导出Excel
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
//此处设置的filename无效 ,前端会重更新设置一下