From 98d9a51e6cdd19a9024baf8b9006297a4302640f Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Sun, 19 Nov 2023 00:36:45 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=8819=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AF=BC=E5=87=BA=EF=BC=8C=E4=B8=8D=E5=86=8D=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=B8=AD=E7=9A=84=E7=BB=99=E4=B8=AA=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=840?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/kc/config/export/Export.java      | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

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<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);