diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java index 42d7ee39..d516ef7c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/export/Export.java @@ -300,8 +300,7 @@ public class Export extends BaseExport { } } } - - if(flist != null && !flist.isEmpty()){ + if(!flist.isEmpty()){ for(KcExportConfigTpkwcqkjzglx e : flist){ int c = Integer.parseInt(StringUtils.defaultString(e.getYtkcs(),"0")); if(c > ytkcs) { @@ -316,6 +315,40 @@ public class Export extends BaseExport { tmpList.add(String.valueOf(ytkcs));//取最大值 tmpList.add(tkcstj.getTkxttj()); + }else{ + //听课统计里面没有的,在这里补0 + List 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 confList = groupConfigMap.get(k); + if(!confList.isEmpty()){ + List list = ghMap.get(x.getGh()); + List 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);