From 20bba074c107ca79fc184a4ff1a4d1c65648727c Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Tue, 29 Aug 2023 14:39:54 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B48=E6=9C=8829=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AF=BC=E5=87=BA=E4=B8=8E=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KcExportConfigTpkwcqkjzglxController.java        | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
index 9648e698..0e36c6a4 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/config/controller/KcExportConfigTpkwcqkjzglxController.java
@@ -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无效 ,前端会重更新设置一下