From 0d980278753ddf8045a5a78d900aed3b20f08226 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Mon, 1 Jul 2024 23:34:27 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B47=E6=9C=881=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98=EF=BC=8C=E5=AE=8C=E5=96=84=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blStuAnswer/mapper/BlStuAnswerMapper.java |  26 +--
 .../mapper/xml/BlStuAnswerMapper.xml          |   8 +-
 .../service/impl/BlStuAnswerServiceImpl.java  | 210 +++++++++---------
 .../jeecg/modules/tools/WebDriverUtil.java    |   4 +-
 4 files changed, 119 insertions(+), 129 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/BlStuAnswerMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/BlStuAnswerMapper.java
index 59b7de5..f0733ac 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/BlStuAnswerMapper.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/BlStuAnswerMapper.java
@@ -160,7 +160,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b2_2_6(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i2_9(String id);
+    Map<String, String> i2_9(String id);
 
     @MapKey("key")
     List<Map<String, String>> t2_10(String id);
@@ -180,7 +180,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b2_3_4(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i2_13(String id);
+    Map<String, String> i2_13(String id);
 
     @MapKey("key")
     List<Map<String, String>> t2_14(String id);
@@ -213,7 +213,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b2_5_3(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i2_18(String id);
+    Map<String, String> i2_18(String id);
 
     @MapKey("key")
     List<Map<String, String>> t2_19(String id);
@@ -248,7 +248,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b2_6_10(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i2_23(String id);
+    Map<String, String> i2_23(String id);
 
     @MapKey("key")
     List<Map<String, String>> t2_24(String id);
@@ -268,7 +268,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b2_7_4(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i2_27(String id);
+    Map<String, String> i2_27(String id);
 
     @MapKey("key")
     List<Map<String, String>> t2_28(String id);
@@ -287,7 +287,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b2_8_5(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i2_30(String id);
+    Map<String, String> i2_30(String id);
 
     @MapKey("key")
     List<Map<String, String>> t2_31(String id);
@@ -313,7 +313,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b2_9_7(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i2_34(String id);
+    Map<String, String> i2_34(String id);
 
     @MapKey("key")
     List<Map<String, String>> t2_35(String id);
@@ -333,7 +333,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b3_1_4(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i3_2(String id);
+    Map<String, String> i3_2(String id);
 
     @MapKey("key")
     List<Map<String, String>> t3_3(String id);
@@ -377,7 +377,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b3_3_5(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i3_10(String id);
+    Map<String, String> i3_10(String id);
 
     @MapKey("key")
     List<Map<String, String>> t3_11(String id);
@@ -397,7 +397,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b4_1_4(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i4_2(String id);
+    Map<String, String> i4_2(String id);
 
     @MapKey("key")
     List<Map<String, String>> t4_3(String id);
@@ -440,7 +440,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b4_3_5(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i4_9(String id);
+    Map<String, String> i4_9(String id);
 
     @MapKey("key")
     List<Map<String, String>> t4_10(String id);
@@ -464,7 +464,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b4_4_6(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i4_13(String id);
+    Map<String, String> i4_13(String id);
 
     @MapKey("key")
     List<Map<String, String>> t4_14(String id);
@@ -486,7 +486,7 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     String b5_1_5(String id);
 
     @MapKey("key")
-    List<Map<String, String>> i5_2(String id);
+    Map<String, String> i5_2(String id);
 
     @MapKey("key")
     List<Map<String, String>> t5_3(String id);
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/xml/BlStuAnswerMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/xml/BlStuAnswerMapper.xml
index 2a76780..aec7ba5 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/xml/BlStuAnswerMapper.xml
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/xml/BlStuAnswerMapper.xml
@@ -736,6 +736,7 @@
 
     <select id="i2_9" resultType="java.util.Map">
         select
+        '学生对专业课“两性一度”评价' as 'key',
         round(sum(ZYK_SKILL2)/count('x'),2) as '课程将知识、能力、素养进行了有机融合',
         round(sum(ZYK_PROBLEM2)/count('x'),2) as '课程教学培养了我解决复杂问题的综合能力',
         round(sum(ZYK_CROSS2)/count('x'),2) as '课程内容注重学科间的交叉与融合',
@@ -950,8 +951,7 @@
         union all
         select '个人独立完成的课程作业' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt  from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_GEREN = #{id})b
         union all
-        select '过课程论文或实验报告' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt  from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_LUNWEN = #{id})b
-
+        select '过课程论文或实验报告' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt  from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_LUNWEN = #{id
     </select>
 
     <select id="i2_17" resultType="java.util.Map">
@@ -2421,7 +2421,7 @@
 
     <select id="i4_13" resultType="java.util.Map">
         select
-        '' as 'key',
+        'key' as 'key',
         round(round(sum(CAMPUS_EQUIPMENT2)/count('x'),2)) as '教室及教学设备',
         round(round(sum(CAMPUS_LAB2)/count('x'),2)) as '实验实训室条件',
         round(round(sum(CAMPUS_BOOK2)/count('x'),2)) as '图书馆资源',
@@ -2523,7 +2523,7 @@
     </select>
 
     <select id="i5_2" resultType="java.util.Map">
-        select '总体满意度',concat(round(sum(SATI_ZONGTI2)/count(*)),'%') as '01' from bl_stu_answer where main_id = #{id}
+        select '总体满意度',round(sum(SATI_ZONGTI2)/count(*)) as '01' from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="t5_3" resultType="java.util.Map">
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java
index a5ce6d4..00332e1 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java
@@ -945,8 +945,9 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	//图片i2_9
 	public void i2_9(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i2_9(id);
-		//TODO sssssss
+		var map = baseMapper.i2_9(id);
+		var imagePath = getRadarChart(map);
+		result.put("i2_9", imagePath);
 	}
 
 
@@ -995,8 +996,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_12(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i2_12(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("b2_3_4", imagePath);
 	}
 
 
@@ -1012,9 +1013,9 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	//图片i2_13
 	public void i2_13(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i2_13(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i2_13(id);
+		var imagePath = getRadarChart(map);
+		result.put("i2_13", imagePath);
 	}
 
 
@@ -1071,8 +1072,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_16(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i2_16(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i2_16", imagePath);
 	}
 
 
@@ -1080,8 +1081,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_17(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i2_17(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i2_17", imagePath);
 	}
 
 
@@ -1092,16 +1093,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		result.put("b2_5_3", baseMapper.b2_5_3(id));
 	}
 
-
 	//图片i2_18
 	public void i2_18(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i2_18(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i2_18(id);
+		var imagePath = getRadarChart(map);
+		result.put("i2_18", imagePath);
 	}
 
-
 	//表格 t2_19
 	//具体方面	大一	大二	大三	大四
 	public void t2_19(WordOperator wo, Map<String, Object> result, String id) {
@@ -1120,7 +1119,6 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(17,1,true,table);
 	}
 
-
 	//表格 t2_20
 	//专业名称	体育教育	美育教育	劳动教育
 	public void t2_20(WordOperator wo, Map<String, Object> result, String id) {
@@ -1138,7 +1136,6 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(18,1,true,table);
 	}
 
-
 	//b2_6_1~5
 	public void b2_6_1(WordOperator wo, Map<String, Object> result, String id) {
 		result.put("b2_6_1", baseMapper.b2_6_1(id));
@@ -1153,8 +1150,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_21(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i2_21(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i2_21", imagePath);
 	}
 
 
@@ -1162,8 +1159,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_22(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i2_22(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i2_22", imagePath);
 	}
 
 
@@ -1180,9 +1177,9 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	//图片i2_23
 	public void i2_23(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i2_23(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i2_23(id);
+		var imagePath = getRadarChart(map);
+		result.put("i2_22", imagePath);
 	}
 
 
@@ -1229,8 +1226,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i2_26(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i2_26(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i2_26", imagePath);
 	}
 
 
@@ -1242,16 +1239,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		result.put("b2_7_4", baseMapper.b2_7_4(id));
 	}
 
-
 	//图片i2_27
 	public void i2_27(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i2_27(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i2_27(id);
+		var imagePath = getRadarChart(map);
+		result.put("i2_27", imagePath);
 	}
 
-
 	//图片i2_28
 	public void t2_28(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
@@ -1269,16 +1264,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(21,1,true,table);
 	}
 
-
 	//图片i2_29
 	public void i2_29(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i2_29(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i2_29", imagePath);
 	}
 
-
 	//b2_8_1~5
 	public void b2_8_1(WordOperator wo, Map<String, Object> result, String id) {
 		result.put("b2_8_1", baseMapper.b2_8_1(id));
@@ -1288,16 +1281,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		result.put("b2_8_5", baseMapper.b2_8_5(id));
 	}
 
-
 	//图片i2_30
 	public void i2_30(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i2_30(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i2_30(id);
+		var imagePath = getRadarChart(map);
+		result.put("i2_30", imagePath);
 	}
 
-
 	//表格 t2_31
 	//	大一	大二	大三	大四
 	public void t2_31(WordOperator wo, Map<String, Object> result, String id) {
@@ -1316,7 +1307,6 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(22,1,true,table);
 	}
 
-
 	//表格 t2_32
 	//专业名称	分析问题、解决问题能力提升	自主学习能力提升	合作能力提升	书面表达和沟通能力提升	有能力规划未来工作生活
 	public void t2_32(WordOperator wo, Map<String, Object> result, String id) {
@@ -1336,16 +1326,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(23,1,true,table);
 	}
 
-
 	//图片i2_33
 	public void i2_33(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i2_33(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i2_33", imagePath);
 	}
 
-
 	//b2_9_1~7
 	public void b2_9_1(WordOperator wo, Map<String, Object> result, String id) {
 		result.put("b2_9_1", baseMapper.b2_9_1(id));
@@ -1357,16 +1345,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		result.put("b2_9_7", baseMapper.b2_9_7(id));
 	}
 
-
 	//图片i2_34
 	public void i2_34(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i2_34(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i2_34(id);
+		var imagePath = getRadarChart(map);
+		result.put("i2_34", imagePath);
 	}
 
-
 	//表格 t2_35
 	//	大一	大二	大三	大四
 	public void t2_35(WordOperator wo, Map<String, Object> result, String id) {
@@ -1385,8 +1371,6 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(24,1,true,table);
 	}
 
-
-
 	//表格 t2_36
 	//专业名称	人文底蕴	科学精神	学会学习	健康生活	责任担当	实践创新	自我提升
 	public void t2_36(WordOperator wo, Map<String, Object> result, String id) {
@@ -1408,16 +1392,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(25,1,true,table);
 	}
 
-
 	//图片i3_1
 	public void i3_1(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i3_1(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i3_1", imagePath);
 	}
 
-
 	//b3_1_1~4
 	public void b3_1_1(WordOperator wo, Map<String, Object> result, String id) {
 		result.put("b3_1_1", baseMapper.b3_1_1(id));
@@ -1426,16 +1408,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		result.put("b3_1_4", baseMapper.b3_1_4(id));
 	}
 
-
 	//图片i3_2
 	public void i3_2(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i3_2(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i3_2(id);
+		var imagePath = getRadarChart(map);
+		result.put("i3_2", imagePath);
 	}
 
-
 	//表格 t3_3
 	//教学工作各方面	大一	大二	大三	大四
 	public void t3_3(WordOperator wo, Map<String, Object> result, String id) {
@@ -1454,7 +1434,6 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(26,1,true,table);
 	}
 
-
 	//表格 t3_4
 	//专业名称	师德师风及精神面貌	教学投入	依法依规，履行教师职责	关心爱护学生
 	public void t3_4(WordOperator wo, Map<String, Object> result, String id) {
@@ -1473,22 +1452,21 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(27,1,true,table);
 	}
 
-
 	//b3_2_1~4
 	public void b3_2_1(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.b3_2_1(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		result.put("b3_2_1", baseMapper.b3_2_1(id));
+		result.put("b3_2_2", baseMapper.b3_2_2(id));
+		result.put("b3_2_3", baseMapper.b3_2_3(id));
+		result.put("b3_2_4", baseMapper.b3_2_4(id));
 	}
 
-
 	//图片i3_5
 	public void i3_5(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i3_5(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i3_5", imagePath);
 	}
 
 
@@ -1497,16 +1475,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		result.put("b3_2_5", baseMapper.b3_2_5(id));
 	}
 
-
 	//图片i3_6
 	public void i3_6(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i3_6(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getBaseHistogram(list);
+		result.put("i3_6", imagePath);
 	}
 
-
 	//表格 t3_7
 	//大一	大二	大三	大四
 	public void t3_7(WordOperator wo, Map<String, Object> result, String id) {
@@ -1525,7 +1501,6 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(28,1,true,table);
 	}
 
-
 	//表格 t3_8
 	//专业名称	教学满意度
 	public void t3_8(WordOperator wo, Map<String, Object> result, String id) {
@@ -1541,13 +1516,13 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(29,1,true,table);
 	}
 
-
 	//图片i3_9
 	public void i3_9(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i3_9(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i3_9", imagePath);
+
 	}
 
 
@@ -1564,9 +1539,9 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	//图片i3_10
 	public void i3_10(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i3_10(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i3_10(id);
+		var imagePath = getRadarChart(map);
+		result.put("i3_10", imagePath);
 	}
 
 
@@ -1588,7 +1563,6 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(30,1,true,table);
 	}
 
-
 	//表格 t3_12
 	//专业名称	重视立德树人，注重发挥课程育人的作用	清楚地向学生解释了所学课程的目标和要求	教学方法灵活多样，引导学生进行创造性思考	课堂上激发学生的学习兴趣	课后为学生提供辅导答疑
 	public void t3_12(WordOperator wo, Map<String, Object> result, String id) {
@@ -1608,16 +1582,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(31,1,true,table);
 	}
 
-
 	//图片i4_1
 	public void i4_1(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i4_1(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i4_1", imagePath);
 	}
 
-
 	//b4_1_1~4
 	public void b4_1_1(WordOperator wo, Map<String, Object> result, String id) {
 		result.put("b4_1_1", baseMapper.b4_1_1(id));
@@ -1626,13 +1598,12 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		result.put("b4_1_4", baseMapper.b4_1_4(id));
 	}
 
-
 	//图片i4_2
 	public void i4_2(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i4_2(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i4_2(id);
+		var imagePath = getRadarChart(map);
+		result.put("i4_2", imagePath);
 	}
 
 
@@ -1654,7 +1625,6 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(32,1,true,table);
 	}
 
-
 	//表格 t4_4
 	//专业名称	学生服务能够做到“一站式”的服务与解决，体现了对学生的关怀	重视实验实训的安全教育与管理	任课教师积极参与学生活动	校内学术讲座报告活动多
 	public void t4_4(WordOperator wo, Map<String, Object> result, String id) {
@@ -1673,7 +1643,6 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		wo.insert2Table(33,1,true,table);
 	}
 
-
 	//b4_2_1~6
 	public void b4_2_1(WordOperator wo, Map<String, Object> result, String id) {
 		result.put("b4_2_1", baseMapper.b4_2_1(id));
@@ -1684,13 +1653,12 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 		result.put("b4_2_6", baseMapper.b4_2_6(id));
 	}
 
-
 	//图片i4_5
 	public void i4_5(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i4_5(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i4_5", imagePath);
 	}
 
 
@@ -1738,8 +1706,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i4_8(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i4_8(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i4_8", imagePath);
 	}
 
 
@@ -1756,9 +1724,9 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	//图片i4_9
 	public void i4_9(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i4_9(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i4_9(id);
+		var imagePath = getRadarChart(map);
+		result.put("i4_9", imagePath);
 	}
 
 
@@ -1805,8 +1773,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i4_12(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i4_12(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i4_12", imagePath);
 	}
 
 
@@ -1824,9 +1792,9 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	//图片i4_13
 	public void i4_13(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i4_13(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i4_13(id);
+		var imagePath = getRadarChart(map);
+		result.put("i4_13", imagePath);
 	}
 
 
@@ -1883,8 +1851,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	public void i5_1(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
 		var list = baseMapper.i5_1(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var imagePath = getStackHistogram(list);
+		result.put("i5_1", imagePath);
 	}
 
 
@@ -1897,9 +1865,31 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
 	//图片i5_2
 	public void i5_2(WordOperator wo, Map<String, Object> result, String id) {
 		//查数据
-		var list = baseMapper.i5_2(id);
-		//套list		//result.put("t1_1_1","默认值");
-		//wo.insert2Table(0,1,)
+		var map = baseMapper.i5_2(id);
+		var json = """
+			{
+			  series: [
+				{
+				  type: 'pie',
+				  radius: ['30%', '50%'],
+				  label: {
+					show: true,
+					fontSize: '42',
+					//fontWeight: 'bold',
+					position: 'center',
+					formatter: (e) => e.name + '\\n' + e.value +'%'
+				  },
+				  data: [
+					{ value: %s, name: '对学校的总体\\n满意度' },
+					{ value: 100-%s, name: '', itemStyle:{color:'#d2d2d2'}},
+				  ]
+				}
+			  ]
+			}
+		""";
+		json = json.formatted(map.get(K01), map.get(K01));
+		var imagePath = WebDriverUtil.getImgByte400(json);
+		result.put("i5_2", imagePath);
 	}
 
 
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/WebDriverUtil.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/WebDriverUtil.java
index fd494d5..a81cc3c 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/WebDriverUtil.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/WebDriverUtil.java
@@ -137,8 +137,8 @@ public class WebDriverUtil {
             e.printStackTrace();
         } finally {
             if(driver != null){
-                //driver.close();
-                //driver.quit();
+                driver.close();
+                driver.quit();
             }
         }
         return null;