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

2023年11月19日 修复导出，不再统计中的给个默认的0

This commit is contained in:
bai 2023-11-19 00:36:45 +08:00
parent 303889b070
commit 98d9a51e6c
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java
View File

@ -300,8 +300,7 @@ public class Export extends BaseExport {
} }
} }
} }
if(!flist.isEmpty()){
if(flist != null && !flist.isEmpty()){
for(KcExportConfigTpkwcqkjzglx e : flist){ for(KcExportConfigTpkwcqkjzglx e : flist){
int c = Integer.parseInt(StringUtils.defaultString(e.getYtkcs(),"0")); int c = Integer.parseInt(StringUtils.defaultString(e.getYtkcs(),"0"));
if(c > ytkcs) { if(c > ytkcs) {
@ -316,6 +315,40 @@ public class Export extends BaseExport {
tmpList.add(String.valueOf(ytkcs));//取最大值 tmpList.add(String.valueOf(ytkcs));//取最大值
tmpList.add(tkcstj.getTkxttj()); tmpList.add(tkcstj.getTkxttj());
}else{
//听课统计里面没有的，在这里补0
List<String> tmpList = new ArrayList<>();
mainList.add(tmpList);
// tmpList.add(null);
// int ytkcs = Integer.parseInt(StringUtils.defaultString(x.getYtkcs(),"0"));
int ytkcs = 0;
if(ghMap.containsKey(x.getGh())){
List<GroupConfig> confList = groupConfigMap.get(k);
if(!confList.isEmpty()){
List<KcExportConfigTpkwcqkjzglx> list = ghMap.get(x.getGh());
List<KcExportConfigTpkwcqkjzglx> flist = Lists.newArrayList();
for (GroupConfig config: confList){
for(KcExportConfigTpkwcqkjzglx l: list){
if(StringUtils.equals(l.getTklx(),config.getDictKey())){
flist.add(l);
}
}
}
if(!flist.isEmpty()){
for(KcExportConfigTpkwcqkjzglx e : flist){
int c = Integer.parseInt(StringUtils.defaultString(e.getYtkcs(),"0"));
if(c > ytkcs) {
ytkcs = c;
}
}
}
}
}
tmpList.add(x.getXm());
tmpList.add(formatDictTxt(x.getTklx(),"tpkwcqkjzglx"));
tmpList.add(String.valueOf(ytkcs));//取最大值
tmpList.add("0");
} }
}); });
WordOperator.fillNullCall(mainList,v,2,3); WordOperator.fillNullCall(mainList,v,2,3);