2024年7月6日 修改问题

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/BlStuAnswerMapper.java

@@ -27,6 +27,9 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
     @MapKey("key")
     List<Map<String, String>> t1_1_3(String id);
 
+    @MapKey("key")
+    List<Map<String, String>> viewBlMajorStatic(String id);
+
     @MapKey("key")
     List<Map<String, String>> i1_1(String id);
 

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/xml/BlStuAnswerMapper.xml

@@ -38,9 +38,12 @@
         select a.POLITICS as 'key',a.POLITICS_cnt as '01',round(round(a.POLITICS_cnt/b.total_cnt,2)*100) as '02' from
         (select POLITICS,count('x') as POLITICS_cnt from bl_stu_answer where main_id = #{id} GROUP BY POLITICS order by POLITICS) a,
         (select count('x') as total_cnt from bl_stu_answer where main_id = #{id}) b
-        where POLITICS is not null
+        where POLITICS is not null and POLITICS != ''
     </select>
 
+    <select id="viewBlMajorStatic" resultType="java.util.Map">
+        select CONCAT(dep,'-',major_maj) as 'key', dep as '01', major_maj as '02', maj_cnt as '03', `round((b.maj_cnt/a.dep_cnt)*100)` as '04' from view_bl_major_static
+    </select>
 
     <select id="i1_1" resultType="java.util.Map">
         select '课前运用网络课程平台、教材或资料进行自主预学，梳理知识并发现问题' as 'key',
@@ -283,19 +286,19 @@
     </select>
 
     <select id="b1_3_1" resultType="String">
-        select concat(round(round(sum(INTERACT_TASK1)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(INTERACT_TASK1)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b1_3_2" resultType="String">
-        select concat(round(round(sum(INTERACT_METHOD1)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(INTERACT_METHOD1)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b1_3_3" resultType="String">
-        select concat(round(round(sum(INTERACT_COMPETITION1)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(INTERACT_COMPETITION1)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b1_3_4" resultType="String">
-        select concat(round(round(sum(INTERACT_RESEARCH1)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(INTERACT_RESEARCH1)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i1_9" resultType="java.util.Map">
@@ -385,13 +388,13 @@
     </select>
 
     <select id="b1_4_1" resultType="String">
-        select concat(round(round(a.freq_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.freq_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as freq_cnt from bl_stu_answer where main_id = #{id} and EXCHANGE_FREQ = '每周至少一次')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
 
     <select id="b1_4_2" resultType="String">
-        select concat(round(round(a.freq_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.freq_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as freq_cnt from bl_stu_answer where main_id = #{id} and EXCHANGE_FREQ = '每月至少一次')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
@@ -466,26 +469,26 @@
     </select>
 
     <select id="b2_1_1" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and SXZZK_SATI = '非常满意')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
 
     <select id="b2_1_2" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and SXZZK_SATI = '比较满意')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
 
     <select id="b2_1_3" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and SXZZK_SATI = '一般')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
 
     </select>
 
     <select id="b2_1_4" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and SXZZK_SATI = '比较不满意')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
@@ -505,11 +508,11 @@
     </select>
 
     <select id="b2_1_5" resultType="String">
-        select concat(round(sum(SXZZK_SATI2)/count(*)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(sum(SXZZK_SATI2)/count(*))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i2_2" resultType="java.util.Map">
-        select '思政课程总体满意度' as 'key',concat(round(sum(SXZZK_SATI2)/count(*)),'%') as '01' from bl_stu_answer where main_id = #{id}
+        select '思政课程总体满意度' as 'key',concat(round(sum(SXZZK_SATI2)/count(*))) as '01' from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="t2_3" resultType="java.util.Map">
@@ -575,19 +578,19 @@
     </select>
 
     <select id="b2_1_6" resultType="String">
-        select concat(round(round(sum(SXZZK_NEIRONG2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SXZZK_NEIRONG2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_1_7" resultType="String">
-        select concat(round(round(sum(SXZZK_ZHILIANG2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SXZZK_ZHILIANG2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_1_8" resultType="String">
-        select concat(round(round(sum(SXZZK_ZHILIANG2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SXZZK_ZHILIANG2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_1_9" resultType="String">
-        select concat(round(round(sum(SXZZK_XIAOGUO2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SXZZK_XIAOGUO2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i2_6" resultType="java.util.Map">
@@ -917,27 +920,27 @@
     </select>
 
     <select id="b2_4_1" resultType="String">
-        select concat(round(round(sum(EVALUATE_JUANMIAN)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(EVALUATE_JUANMIAN)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_4_2" resultType="String">
-        select concat(round(round(sum(EVALUATE_TIWEN)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(EVALUATE_TIWEN)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_4_3" resultType="String">
-        select concat(round(round(sum(EVALUATE_XIAOZU)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(EVALUATE_XIAOZU)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_4_4" resultType="String">
-        select concat(round(round(sum(EVALUATE_ZHANSHI)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(EVALUATE_ZHANSHI)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_4_5" resultType="String">
-        select concat(round(round(sum(EVALUATE_GEREN)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(EVALUATE_GEREN)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_4_6" resultType="String">
-        select concat(round(round(sum(EVALUATE_LUNWEN)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(EVALUATE_LUNWEN)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i2_16" resultType="java.util.Map">
@@ -1055,23 +1058,23 @@
     </select>
 
     <select id="b2_6_1" resultType="String">
-        select concat(round(round(sum(ACTIVITY_SOCIETY)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(ACTIVITY_SOCIETY)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_6_2" resultType="String">
-        select concat(round(round(sum(ACTIVITY_CULTURE)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(ACTIVITY_CULTURE)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_6_3" resultType="String">
-        select concat(round(round(sum(ACTIVITY_INTERN)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(ACTIVITY_INTERN)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_6_4" resultType="String">
-        select concat(round(round(sum(ACTIVITY_INNO)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(ACTIVITY_INNO)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_6_5" resultType="String">
-        select concat(round(round(sum(ACTIVITY_GLOBAL)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(ACTIVITY_GLOBAL)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i2_21" resultType="java.util.Map">
@@ -1144,23 +1147,23 @@
     </select>
 
     <select id="b2_6_6" resultType="String">
-        select concat(round(avg(ACTISATI_GLOBAL2)),'%') from bl_stu_answer where main_id = #{id} and ACTISATI_GLOBAL2+0 > 0
+        select concat(round(avg(ACTISATI_GLOBAL2))) from bl_stu_answer where main_id = #{id} and ACTISATI_GLOBAL2+0 > 0
     </select>
 
     <select id="b2_6_7" resultType="String">
-        select concat(round(avg(ACTISATI_SOCIETY2)),'%') from bl_stu_answer where main_id = #{id} and ACTISATI_SOCIETY2 + 0 > 0
+        select concat(round(avg(ACTISATI_SOCIETY2))) from bl_stu_answer where main_id = #{id} and ACTISATI_SOCIETY2 + 0 > 0
     </select>
 
     <select id="b2_6_8" resultType="String">
-        select concat(round(avg(ACTISATI_CULTURE2)),'%') from bl_stu_answer where main_id = #{id} and ACTISATI_CULTURE2 + 0 > 0
+        select concat(round(avg(ACTISATI_CULTURE2))) from bl_stu_answer where main_id = #{id} and ACTISATI_CULTURE2 + 0 > 0
     </select>
 
     <select id="b2_6_9" resultType="String">
-        select concat(round(avg(ACTISATI_INNO2)),'%') from bl_stu_answer where main_id = #{id} and ACTISATI_INNO2 + 0 > 0
+        select concat(round(avg(ACTISATI_INNO2))) from bl_stu_answer where main_id = #{id} and ACTISATI_INNO2 + 0 > 0
     </select>
 
     <select id="b2_6_10" resultType="String">
-        select concat(round(avg(ACTISATI_INTERN2)),'%') from bl_stu_answer where main_id = #{id} and ACTISATI_INTERN2 + 0 > 0
+        select concat(round(avg(ACTISATI_INTERN2))) from bl_stu_answer where main_id = #{id} and ACTISATI_INTERN2 + 0 > 0
     </select>
 
     <select id="i2_23" resultType="java.util.Map">
@@ -1277,19 +1280,19 @@
     </select>
 
     <select id="b2_7_1" resultType="String">
-        select concat(round(round(sum(INTERN_CONTENT_SATIS2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(INTERN_CONTENT_SATIS2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_7_2" resultType="String">
-        select concat(round(round(sum(INTERN_TIME_SATIS2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(INTERN_TIME_SATIS2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_7_3" resultType="String">
-        select concat(round(round(sum(INTERN_GUIDE_SATIS2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(INTERN_GUIDE_SATIS2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_7_4" resultType="String">
-        select concat(round(round(sum(INTERN_EQUIP_SATIS2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(INTERN_EQUIP_SATIS2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i2_27" resultType="java.util.Map">
@@ -1552,31 +1555,31 @@
     </select>
 
     <select id="b2_9_1" resultType="String">
-        select concat(round(round(sum(SUYANG_RENWEN2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SUYANG_RENWEN2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_9_2" resultType="String">
-        select concat(round(round(sum(SUYANG_KEXUE2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SUYANG_KEXUE2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_9_3" resultType="String">
-        select concat(round(round(sum(SUYANG_XUEXI2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SUYANG_XUEXI2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_9_4" resultType="String">
-        select concat(round(round(sum(SUYANG_SHENGHUO2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SUYANG_SHENGHUO2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_9_5" resultType="String">
-        select concat(round(round(sum(SUYANG_ZEREN2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SUYANG_ZEREN2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_9_6" resultType="String">
-        select concat(round(round(sum(SUYANG_SHIJIAN2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SUYANG_SHIJIAN2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_9_7" resultType="String">
-        select concat(round(round(sum(SUYANG_TISHENG2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(SUYANG_TISHENG2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i2_34" resultType="java.util.Map">
@@ -1710,28 +1713,28 @@
     </select>
 
     <select id="b3_1_1" resultType="String">
-        select concat(round(round(sum(TEACHERSATI_MORAL2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(TEACHERSATI_MORAL2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b3_1_2" resultType="String">
-        select concat(round(round(sum(TEACHERSATI_INPUT2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(TEACHERSATI_INPUT2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b3_1_3" resultType="String">
-        select concat(round(round(sum(TEACHERSATI_LAW2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(TEACHERSATI_LAW2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b3_1_4" resultType="String">
-        select concat(round(round(sum(TEACHERSATI_CARE2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(TEACHERSATI_CARE2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i3_2" resultType="java.util.Map">
         select
         '教学工作各方面满意度' as 'key',
-        concat(round(round(sum(TEACHERSATI_MORAL2)/count('x'),2)),'%') as '师德师风及精神面貌',
+        concat(round(round(sum(TEACHERSATI_MORAL2)/count('x'),2))) as '师德师风及精神面貌',
-        concat(round(round(sum(TEACHERSATI_INPUT2)/count('x'),2)),'%') as '教学投入',
+        concat(round(round(sum(TEACHERSATI_INPUT2)/count('x'),2))) as '教学投入',
-        concat(round(round(sum(TEACHERSATI_LAW2)/count('x'),2)),'%') as '依法依规，履行教师职责',
+        concat(round(round(sum(TEACHERSATI_LAW2)/count('x'),2))) as '依法依规，履行教师职责',
-        concat(round(round(sum(TEACHERSATI_CARE2)/count('x'),2)),'%') as '关心爱护学生'
+        concat(round(round(sum(TEACHERSATI_CARE2)/count('x'),2))) as '关心爱护学生'
         from bl_stu_answer where main_id = #{id}
     </select>
 
@@ -1775,25 +1778,25 @@
     </select>
 
     <select id="b3_2_1" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and TEACHERSATI_ZONGTI = '非常满意')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
 
     <select id="b3_2_2" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and TEACHERSATI_ZONGTI = '比较满意')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
 
     <select id="b3_2_3" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and TEACHERSATI_ZONGTI = '比较不满意')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
 
     <select id="b3_2_4" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and TEACHERSATI_ZONGTI = '比较不满意')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
@@ -1813,11 +1816,11 @@
     </select>
 
     <select id="b3_2_5" resultType="String">
-        select concat(round(sum(TEACHERSATI_ZONGTI2)/count(*)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(sum(TEACHERSATI_ZONGTI2)/count(*))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i3_6" resultType="java.util.Map">
-        select '教学满意度' as 'key',concat(round(sum(TEACHERSATI_ZONGTI2)/count(*)),'%') as '01' from bl_stu_answer where main_id = #{id}
+        select '教学满意度' as 'key',concat(round(sum(TEACHERSATI_ZONGTI2)/count(*))) as '01' from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="t3_7" resultType="java.util.Map">
@@ -2089,27 +2092,27 @@
     </select>
 
     <select id="b4_2_1" resultType="String">
-        select concat(round(round(sum(XYZD_KECHENG)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(XYZD_KECHENG)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_2_2" resultType="String">
-        select concat(round(round(sum(XYZD_JIAOSHI)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(XYZD_JIAOSHI)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_2_3" resultType="String">
-        select concat(round(round(sum(XYZD_WANGZHAN)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(XYZD_WANGZHAN)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_2_4" resultType="String">
-        select concat(round(round(sum(XYZD_FDY)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(XYZD_FDY)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_2_5" resultType="String">
-        select concat(round(round(sum(XYZD_DAOSHI)/count('x'),2)*100),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(XYZD_DAOSHI)/count('x'),2)*100)) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_2_6" resultType="String">
-        select concat(round(round(b.no_cnt/a.tot_cnt,2)*100),'%') 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 XYZD_NO = #{id})b
+        select concat(round(round(b.no_cnt/a.tot_cnt,2)*100)) 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 XYZD_NO = #{id})b
     </select>
 
     <select id="i4_5" resultType="java.util.Map">
@@ -2243,23 +2246,23 @@
     </select>
 
     <select id="b4_3_1" resultType="String">
-        select concat(round(round(sum(STUSATI_PHYCHO2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(STUSATI_PHYCHO2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_3_2" resultType="String">
-        select concat(round(round(sum(STUSATI_PLAN2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(STUSATI_PLAN2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_3_3" resultType="String">
-        select concat(round(round(sum(STUSATI_FDY2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(STUSATI_FDY2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_3_4" resultType="String">
-        select concat(round(round(sum(STUSATI_XYZD2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(STUSATI_XYZD2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_3_5" resultType="String">
-        select concat(round(round(sum(STUSATI_ZZ2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(STUSATI_ZZ2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i4_9" resultType="java.util.Map">
@@ -2396,27 +2399,27 @@
     </select>
 
     <select id="b4_4_1" resultType="String">
-        select concat(round(round(sum(CAMPUS_EQUIPMENT2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(CAMPUS_EQUIPMENT2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_4_2" resultType="String">
-        select concat(round(round(sum(CAMPUS_LAB2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(CAMPUS_LAB2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_4_3" resultType="String">
-        select concat(round(round(sum(CAMPUS_BOOK2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(CAMPUS_BOOK2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_4_4" resultType="String">
-        select concat(round(round(sum(CAMPUS_INTERNET2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(CAMPUS_INTERNET2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_4_5" resultType="String">
-        select concat(round(round(sum(CAMPUS_SPORT2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(CAMPUS_SPORT2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b4_4_6" resultType="String">
-        select concat(round(round(sum(CAMPUS_RESIDENCE2)/count('x'),2)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(round(sum(CAMPUS_RESIDENCE2)/count('x'),2))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i4_13" resultType="java.util.Map">
@@ -2481,25 +2484,25 @@
     </select>
 
     <select id="b5_1_1" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and SATI_ZONGTI = '非常满意')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
 
     <select id="b5_1_2" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and SATI_ZONGTI = '比较满意')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
 
     <select id="b5_1_3" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and SATI_ZONGTI = '一般')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
 
     <select id="b5_1_4" resultType="String">
-        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100),'%') from
+        select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from
         (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and SATI_ZONGTI = '比较不满意')a,
         (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b
     </select>
@@ -2519,7 +2522,7 @@
     </select>
 
     <select id="b5_1_5" resultType="String">
-        select concat(round(sum(SATI_ZONGTI2)/count(*)),'%') from bl_stu_answer where main_id = #{id}
+        select concat(round(sum(SATI_ZONGTI2)/count(*))) from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i5_2" resultType="java.util.Map">

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/WebDriverUtil.java

@@ -4,18 +4,12 @@ package org.jeecg.modules.tools;
 import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.io.resource.ClassPathResource;
-import cn.hutool.core.io.resource.Resource;
 import cn.hutool.core.io.resource.ResourceUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.URLUtil;
-import cn.hutool.setting.dialect.Props;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.SpringContextHolder;
-import org.jeecg.common.util.SpringContextUtils;
-import org.jeecg.modules.tools.word.WordOperator;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
@@ -23,23 +17,30 @@ import org.openqa.selenium.chrome.ChromeOptions;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.ByteArrayInputStream;
-import java.net.URL;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Date;
-import java.util.Random;
+import java.util.Map;
 
 @Slf4j
 public class WebDriverUtil {
 
+//    private static final Global global = null;
     private static final Global global = SpringContextHolder.getBean(Global.class);
 
     //private static BASE64Decoder decoder = new sun.misc.BASE64Decoder();
 
     public static void main(String []s){
-        String imgName = getImgByte("{     xAxis: {         type: 'category',         data: ['依法依规，履行教师职责', '关心爱护学生', '精神面貌及品德修养良好']     },     yAxis: {         type: 'value'     },     series: [{         data: [820, 932, 901],         type: 'bar'     }] }");
+//        String imgName = getImgByte("{     xAxis: {         type: 'category',         data: ['依法依规，履行教师职责', '关心爱护学生', '精神面貌及品德修养良好']     },     yAxis: {         type: 'value'     },     series: [{         data: [820, 932, 901],         type: 'bar'     }] }");
-        log.info("================================");
+//        log.info("================================");
-        log.info(imgName);
+//        log.info(imgName);
-        log.info("================================");
+//        log.info("================================");
+        String currentDir = System.getProperty("user.dir");
+        log.info(currentDir);
+
     }
 
     /**
@@ -67,35 +68,77 @@ public class WebDriverUtil {
         return new ChromeDriver(chromeOptions);
     }
 
-    public static URL getUrl(String path) {
+    public static File getResourcesFileToTempFile(String path) {
-        return URLUtil.getURL(path);
+        //判断文件存不存在
+        String currentDir = System.getProperty("user.dir");
+        var file = new File(currentDir + File.separator + "applicationTemp");
+		var tempFile = new File(file.getPath() + File.separator + path);
+        if(!tempFile.exists()){
+            var is = ResourceUtil.getStream(path);
+            var out = FileUtil.getOutputStream(tempFile);
+            IoUtil.copy(is, out);
+
+            IoUtil.close(is);
+            IoUtil.close(out);
+        }
+        return tempFile;
+    }
+
+    public static File getUrl(String path) {
+        return getResourcesFileToTempFile(path);
     }
 
     public static String getUrlStr(String path) {
-        return URLUtil.getURL(path).getPath();
+        return getUrl(path).getPath();
     }
 
     public static String getImgByte(String json) {
-        return getImgByte(json, null);
+        return getImgByte(json, null, null);
+    }
+
+    public static String getImgByte(String json, String path) {
+        return getImgByte(json, path, null);
     }
 
     /**
      * 获取图片byte
      */
-    public static String getImgByte(String json, String path) {
+    public static String getImgByte(String json, String path, Map<String, String> runJs) {
         log.info("发往浏览器的json: {}",json);
         WebDriver driver = null;
         try {
             driver = getWebDriver();
             //访问网址
+            log.info("往缓存写入jar包里的资源");
+            //把js拉过来
+            getUrl(global.getConfig("webDriver.webHTMLPath") + "/echarts.min.js");
             if(StringUtils.isNotBlank(path)){
                 driver.get(getUrl(global.getConfig("webDriver.webHTMLPath") + "/" + path).toString());
             } else {
                 driver.get(getUrl(global.getConfig("webDriver.webHTMLPath") + "/echarts.html").toString());
             }
-            log.info(driver.getCurrentUrl());
+            log.info("最终浏览器执行的地址: {}",driver.getCurrentUrl());
             JavascriptExecutor js = (JavascriptExecutor) driver;
-            js.executeScript("showImg(" + json + ")");
+            //执行绘制图片前
+            var runJsStr = "showImg(" + json + ")";
+            //绘制方法是默认的还是自定义的
+            if(runJs != null && runJs.containsKey("showImg")){
+                runJsStr = runJs.get("showImg");
+            }
+            if(runJs != null && runJs.containsKey("runBefore")){
+                runJsStr = runJs.get("runBefore") + runJsStr;
+            }
+            //执行绘制图片后
+            if(runJs != null && runJs.containsKey("runAfter")){
+                runJsStr = runJsStr + runJs.get("runAfter");
+            }
+//            绘制方法是默认的还是自定义的
+//            if(runJs != null && runJs.containsKey("showImg")){
+//                js.executeScript(runJs.get("showImg"));
+//            } else {
+//                js.executeScript("showImg(" + json + ")");
+//            }
+            js.executeScript(runJsStr);
             //延迟1秒等待折线图绘制完成
             Thread.sleep(1000);
             String imgTxt = js.executeScript("return returnEchartImg()").toString().replace("data:image/png;base64,", "");

jeecg-boot/jeecg-module-demo/src/main/resources/officetemplates/exp1/student-tjfx.docx

@@ -413,14 +413,12 @@
    学习主动性
 学习主动性：指学生在自我意识的支配下，有目的自觉自愿地进行学习，从课前、课堂、课后三个维度衡量学生的学习主动性。
 学生对于自身学习主动性各方面的评价各项占比详见下图。
-                                       
                              <i1_1,400,170>
                                        
  学生学习主动性评价各项占比
 
 在落实推进学生刻苦读书学习，增强学习主动性方面，该校学生评价自身"课前运用网络课程平台、教材或资料进行自主预学，梳理知识并发现问题"的符合程度得分为{b1_1_1}分，"课堂上能跟上老师的讲解，主动提问或参与讨论，每节课学有所获"的符合程度得分为{b1_1_2}分，"课后复习笔记及总结课堂教学相关知识"的符合程度得分为{b1_1_3}分，"除了阅读教材，还延伸阅读教师推荐的其他相关书目"的符合程度得分为{b1_1_4}分。
-                                       
+                             <i1_2,400,210>
-                             <i1_2,400,170>
  各环节学生学习主动性
 
 注：图表中数值为计算所得平均分数。
@@ -523,7 +521,6 @@ Z
 
    同辈互动
 同辈互动频率：指学生和其他同学的学习互动情况。评价结果分为"总是"、"经常"、"偶尔"、"从不"，其中选择"总是"、"经常"的人群属于积极互动。该校学生"总是"和"经常""和同学合作完成课程任务或作业"的比例为{b1_3_1}%，"从同学那里学习、吸收好的学习方法"的比例为{b1_3_2}%，"和同学一起参加学科竞赛"的比例为{b1_3_3}%，"和同学一起参与老师科研团队"的比例为{b1_3_4}%。
-                                       
                              <i1_9,400,170>
  学生同辈互动频率
 
@@ -561,11 +558,9 @@ Z
    师生课下互动
 师生课下互动频率：指学生与任课教师课下交流互动的平均频率。评价结果分为"每周至少一次"、"每月至少一次"、"每学期至少一次"、"每年至少一次"。
 该校学生评价课下与任课教师交流互动"每周至少一次"的比例为{b1_4_1}%，"每月至少一次"的比例为{b1_4_2}%。
-                                       
                              <i1_12,400,170>
  师生课下交流互动频率
 
-                                       
                              <i1_13,400,170>
  各年级师生课下交流互动频率
 
@@ -588,12 +583,10 @@ Z
    思政课程
 思政课程满意度：指学生对本校思想政治课的总体满意度，以及分别对思想政治课的课程设置、教学内容、教学质量、教学效果的满意度评价。
 从思政课程总体满意度评价的各项占比来看，该校学生选择"非常满意"的占{b2_1_1}%，"比较满意"的占{b2_1_2}%，"一般"的占{b2_1_3}%，"比较不满意"的占{b2_1_4}%。
-                                       
                              <i2_1,400,170>
  思政课程总体满意度评价各项占比
 
 在落实思政课程建设方面，该校学生评价本校思想政治课程的总体满意度为{b2_1_5}%。
-                                       
                              <i2_2,400,170>
  思政课程总体满意度
 
@@ -624,12 +617,10 @@ Z
 注2：个别专业由于样本较少没有展示。
 
 学生对于思政课程各分项满意度评价的各项占比详见下图。
-                                       
                              <i2_5,400,170>
  思政课程各分项满意度评价的各项占比
 
 该校学生对本校思想政治课程的教学内容满意度为{b2_1_6}%，对教学形式的满意度为{b2_1_7}%，对教学质量的满意度为{b2_1_8}%，对教学效果的满意度为{b2_1_9}%。
-                                       
                              <i2_6,400,170>
  思政课程各分项满意度
 
@@ -652,12 +643,10 @@ Z
    专业课"两性一度"
 专业课"两性一度"评价：指学生对专业课程的"高阶性"、"创新性"、"挑战度"的评价。
 学生对于专业课"两性一度"各方面的评价各项占比详见下图。
-                                       
                              <i2_8,400,170>
  专业课"两性一度"评价各项占比
 
 在落实课堂教学改革、提高课程两性一度方面，该校学生对专业课程的评价如下：高阶性方面，"课程将知识、能力、素养进行了有机融合"的符合程度得分为{b2_2_1}分，"课程教学培养了我解决复杂问题的综合能力"的符合程度得分为{b2_2_2}分；创新性方面，"课程内容注重学科间的交叉与融合"的符合程度得分为{b2_2_3}分，"课程内容反映了学科发展的前沿内容"的符合程度得分为{b2_2_4}分，"课程教学内容重视实践与理论的结合"的符合程度得分为{b2_2_5}分；挑战度方面，"需要非常努力才能达到课程要求"的符合程度得分为{b2_2_6}分。
-                                       
                              <i2_9,400,170>
  学生对专业课"两性一度"评价
 
@@ -671,42 +660,12 @@ Z
                                     大二
                                     大三
                                     大四
-高阶性
+Z
-课程将知识、能力、素养进行了有机融合
+Z
-                                     4.33
+                                       Z
-                                     4.10
+                                       Z
-                                     4.09
+                                       Z
-                                     4.11
+                                       Z
-高阶性
-课程教学培养了我解决复杂问题的综合能力
-                                     4.31
-                                     4.04
-                                     4.04
-                                     4.07
-创新性
-课程内容注重学科间的交叉与融合
-                                     4.33
-                                     4.09
-                                     4.10
-                                     4.10
-创新性
-课程内容反映了学科发展的前沿内容
-                                     4.33
-                                     4.06
-                                     4.06
-                                     4.08
-创新性
-课程教学内容重视实践与理论的结合
-                                     4.34
-                                     4.09
-                                     4.08
-                                     4.08
-挑战度
-需要非常努力才能达到课程要求
-                                     3.95
-                                     3.82
-                                     3.84
-                                     3.83
 注：图表中数值为计算所得平均分数。
 
  各专业学生对专业课"两性一度"评价
@@ -736,12 +695,10 @@ Z
    教学方式
 专业课教学方式的评价：指学生对专业课程任课教师采用的教学方式的评价，包括讲授式、互动式、案例式、项目式等。
 学生对于专业课教学方式的评价各项占比详见下图。
-                                       
                              <i2_12,400,170>
  专业课教学方式评价各项占比
 
 在推动"以学为中心、以教为主导"的课堂教学改革方面，该校学生对专业课程的教学方法使用情况评价如下，"课程以传统的教师讲授为主"的符合程度得分为{b2_3_1}分，"课堂中加入互动环节，注重学生参与（提问、讨论）"的符合程度得分为{b2_3_2}分，"提供案例或实例讨论"的符合程度得分为{b2_3_3}分，"采用小组合作的项目式教学方式"的符合程度得分为{b2_3_4}分。
-                                       
                              <i2_13,400,170>
  学生对专业课教学方式评价
 
@@ -780,19 +737,16 @@ Z
    考核方式
 考核方式参与情况：指学生本学年参与本校各项考核方式的情况，考核方式包括卷面考试、随堂提问或测试、课程论文或实验报告、课堂展示、个人独立完成的课程作业、小组合作完成的课程作业等。
 本学年，该校学生有{b2_4_1}%参与过卷面考试，有{b2_4_2}%参与过随堂提问或测试，有{b2_4_3}%参与过小组合作完成的课程作业，有{b2_4_4}%参与过课堂展示，有{b2_4_5}%参与过个人独立完成的课程作业，有{b2_4_6}%参与过课程论文或实验报告。
-                                       
                              <i2_16,400,170>
  各项考核方式参与情况
 
    体美劳教育
 体美劳教育满意度：指学生对本校开展的体美劳教育的评价。其中体育教育包含如课内外体育活动、俱乐部等；美育教育包含如公共艺术课程、校园文化艺术节、艺术展演活动、艺术社团、美育专题讲座等；劳动教育包含如劳动类课程、本专业领域的实习实践、勤工助学、助教助研、校园清洁、社会公益活动等。
 学生对于体美劳教育评价的各项占比详见下图。
-                                       
                              <i2_17,400,170>
  体美劳教育满意度评价各项占比
 
 在落实体美劳教育建设方面，该校学生评价体育教育的满意度为{b2_5_1}%，美育教育的满意度为{b2_5_2}%，劳动教育的满意度为{b2_5_3}%。
-                                       
                              <i2_18,400,170>
  体美劳教育满意度
 
@@ -829,18 +783,15 @@ Z
    学生发展活动
 学生发展活动参与度：指学生参与本校各项学生发展活动的比例，学生发展活动包括学生社团活动、校园文化活动、社会实践活动、创新创业活动、国际交流活动等，其中校园文化活动包含如文化节、辩论赛、运动会等；社会实践活动如包括志愿服务、参观考察等；创新创业活动包含如创新创业课程、创新创业活动和竞赛等；国际交流活动包含如海外访学、国际科研项目、参加国际会议、与来华交流的海外访学团交流等。
 该校受访学生在学生社团活动上的参与度为{b2_6_1}%，在校园文化活动上的参与度为{b2_6_2}%，在社会实践活动上的参与度为{b2_6_3}%，在创新创业活动上的参与度为{b2_6_4}%，在国际交流活动上的参与度为{b2_6_5}%。
-                                       
                              <i2_21,400,170>
  各项学生发展活动参与度
 
 学生发展活动满意度：指参与过以上各项活动的学生对该项学生发展活动的满意度评价。
 学生对于各项学生发展活动评价的各项占比详见下图。
-                                       
                              <i2_22,400,170>
  学生发展活动满意度评价各项占比
 
 该校参与过以上各项学生发展活动的学生，评价国际交流活动的满意度为{b2_6_6}%，学生社团活动的满意度为{b2_6_7}%，校园文化活动的满意度为{b2_6_8}%，创新创业活动的满意度为{b2_6_9}%，社会实践活动的满意度为{b2_6_10}%。
-                                       
                              <i2_23,400,170>
  各项学生发展活动满意度
 
@@ -881,12 +832,10 @@ Z
    实习实践
 实习实践满意度：指学生对本校实习实践各方面的评价。
 学生对于本校实习实践各方面满意度评价的各项占比详见下图。
-                                       
                              <i2_26,400,170>
  本校实习实践满意度评价各项占比
 
 在落实实践教学建设方面，该校学生评价本校实习实践内容的满意度为{b2_7_1}%，实习实践时间安排的满意度为{b2_7_2}%，实习实践指导情况的满意度为{b2_7_3}%，实习实践场地及设备的满意度为{b2_7_4}%。
-                                       
                              <i2_27,400,170>
  本校实习实践各方面满意度
 
@@ -910,12 +859,10 @@ Z
    学习收获
 学习收获评价：指学生对通过在校学习所获得的分析问题、解决问题能力、自主学习能力、合作能力等方面的评价。
 学生对于在校学习收获各方面的评价各项占比详见下图。
-                                       
                              <i2_29,400,170>
  学习收获评价各项占比
 
 在对在校学习所取得的收获方面，该校学生的评价如下："分析问题、解决问题能力提升"的符合程度得分为{b2_8_1}分，"自主学习能力提升"的符合程度得分为{b2_8_2}分，"合作能力提升"的符合程度得分为{b2_8_3}分，"书面表达和沟通能力提升"的符合程度得分为{b2_8_4}分，"有能力规划未来工作生活"的符合程度得分为{b2_8_5}分。
-                                       
                              <i2_30,400,170>
  学生对学习收获的评价
 
@@ -956,12 +903,10 @@ Z
    核心素养
 核心素养满意度：指学生对自我核心素养提升方面的评价。其中核心素养主要包括人文底蕴（人文积淀、人文情怀、审美情趣等）、科学精神（理性思维、批判质疑、勇于探究等）、学会学习（乐学善学、勤于反思、信息意识等）、健康生活（珍爱生命、健全人格、自我管理等）、责任担当（社会责任、国家认同、国际理解等）、实践创新（劳动意识、问题解决、技术应用等）和自我提升（变得自信、善于交友、学会包容等）等方面。 
 学生对于自我核心素养提升各方面的评价各项占比详见下图。
-                                       
                              <i2_33,400,170>
  核心素养满意度评价各项占比
 
 在自我核心素养提升方面，该校学生对"人文底蕴"的满意度为{b2_9_1}%，"科学精神"的满意度为{b2_9_2}%，"学会学习"的满意度为{b2_9_3}%，"健康生活"的满意度为{b2_9_4}%，"责任担当"的满意度为{b2_9_5}%，"实践创新"的满意度为{b2_9_6}%，"自我提升"的满意度为{b2_9_7}%。
-                                       
                              <i2_34,400,170>
  学生评价核心素养满意度
 
@@ -1007,12 +952,10 @@ Z
    教学工作
 教学工作满意度：指学生对教师教学工作各方面的评价。
 学生对于教师教学工作各方面的评价各项占比详见下图。
-                                       
                              <i3_1,400,170>
  教学工作满意度评价各项占比
 
 在教师教学工作方面，该校学生评价教师"师德师风及精神面貌"的满意度为{b3_1_1}%，"教学投入"的满意度为{b3_1_2}%，"依法依规，履行教师职责"的满意度为{b3_1_3}%，"关心爱护学生"的满意度为{b3_1_4}%。
-                                       
                              <i3_2,400,170>
  教学工作各方面满意度
 
@@ -1051,12 +994,10 @@ Z
    教学满意度
 教学满意度：指学生对教师总体教学满意度的评价。
 从教学满意度评价的各项占比来看，该校学生选择"非常满意"的占{b3_2_1}%，"比较满意"的占{b3_2_2}%，"一般"的占{b3_2_3}%，"比较不满意"的占{b3_2_4}%。
-                                       
                              <i3_5,400,170>
  教学满意度评价各项占比
 
 在提高教师教学能力成效方面，该校学生评价的本校总体教学满意度为{b3_2_5}%。
-                                       
                              <i3_6,400,170>
  教学满意度
 
@@ -1089,12 +1030,10 @@ Z
    教师教学行为
 教师教学行为的评价：指学生对大学期间任课教师教学行为的各个方面进行评价。
 学生对于教师教学行为各方面的评价各项占比详见下图。
-                                       
                              <i3_9,400,170>
  教师教学行为评价各项占比
 
 在教师教学能力方面，该校学生评价教师"重视立德树人，注重发挥课程育人的作用"的符合程度得分为{b3_3_1}分，"清楚地向学生解释了所学课程的目标和要求"的符合程度得分为{b3_3_2}分，"教学方法灵活多样，引导学生进行创造性思考"的符合程度得分为{b3_3_3}分，"课堂上激发学生的学习兴趣"的符合程度得分为{b3_3_4}分，"课后为学生提供辅导答疑"的符合程度得分为{b3_3_5}分。
-                                       
                              <i3_10,400,170>
  教师各方面教学行为评价
 
@@ -1136,12 +1075,10 @@ Z
    学生中心体现和安全管理
 学生中心理念的体现和安全管理情况：指学生评价学校在学生服务以及教务管理等方面体现"以学生为中心"和安全管理的情况。
 学生对于学校落实"学生中心"和安全管理各方面的评价各项占比详见下图。
-                                       
                              <i4_1,400,170>
  本校体现"学生中心"和安全管理评价各项占比
 
 在落实"以学生为中心"和安全管理方面，该校学生评价本校"学生服务能够做到"一站式"的服务与解决，体现了对学生的关怀"的符合程度得分为{b4_1_1}分，"重视实验实训的安全教育与管理"的符合程度得分为{b4_1_2}分，"任课教师积极参与学生活动"的符合程度得分为{b4_1_3}分，"校内学术讲座报告活动多"的符合程度得分为{b4_1_4}分。
-                                       
                              <i4_2,400,170>
  本校体现"学生中心"和安全管理各方面评价
 
@@ -1180,7 +1117,6 @@ Z
    学业指导
 接受学业指导比例：指学生接受过学校各项学业指导或帮扶的比例。
 在落实以本为本，提升学生学业指导建设方面，该校学生接受过"学校或学院提供的辅导课程或相关活动"的比例为{b4_2_1}%，接受过"任课教师帮助解决相关问题"的比例为{b4_2_2}%，接受过"学业指导网站相关服务"的比例为{b4_2_3}%，接受过"辅导员帮助解决相关问题"的比例为{b4_2_4}%，接受过"本科生导师帮助解决相关问题"的比例为{b4_2_5}%，另有{b4_2_6}% 的学生没有接受过本校提供的学业指导服务。
-                                       
                              <i4_5,400,170>
  接受各项学业指导的比例
 
@@ -1220,12 +1156,10 @@ Z
    学生工作
 学生工作满意度：指学生对学校各项学生工作的评价。
 学生对于本校学生工作各方面评价的各项占比详见下图。
-                                       
                              <i4_8,400,170>
  学生工作满意度评价各项占比
 
 该校学生评价本校"心理健康教育／咨询"的满意度为{b4_3_1}%，"职业生涯规划和就业创业指导"的满意度为{b4_3_2}%，"班主任、辅导员工作"的满意度为{b4_3_3}%，"学业指导工作"的满意度为{b4_3_4}%，"重视家庭经济困难学生资助工作"的满意度为{b4_3_5}%。
-                                       
                              <i4_9,400,170>
  各项学生工作满意度
 
@@ -1266,12 +1200,10 @@ Z
    资源条件
 资源条件满意度：指学生对本校资源条件各方面的评价。
 学生对于本校资源条件各方面评价的各项占比详见下图。
-                                       
                              <i4_12,400,170>
  资源条件满意度评价各项占比
 
 在落实条件保障方面，该校学生评价本校"教室及教学设备"的满意度为{b4_4_1}%，"实验实训室条件"的满意度为{b4_4_2}%，"图书馆资源"的满意度为{b4_4_3}%，"网络资源"的满意度为{b4_4_4}%，"体育文化等基础设施"的满意度为{b4_4_5}%，"住宿条件"的满意度为{b4_4_6}%。
-                                       
                              <i4_13,400,170>
  资源条件各方面满意度
 
@@ -1313,12 +1245,10 @@ Z
 
  总体满意度
 从总体满意度评价的各项占比来看，该校学生选择"非常满意"的占{b5_1_1}%，"比较满意"的占{b5_1_2}%，"一般"的占{b5_1_3}%，"比较不满意"的占{b5_1_4}%。
-                                       
                              <i5_1,400,170>
  总体满意度评价各项占比
 
 在总体满意度方面，该校学生对本校的总体满意度为{b5_1_5}%。
-                                       
                              <i5_2,400,170>
  总体满意度
 

jeecg-boot/pom.xml

@@ -507,6 +507,9 @@
                         <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
                         <nonFilteredFileExtension>svg</nonFilteredFileExtension>
 						<nonFilteredFileExtension>docx</nonFilteredFileExtension>
+						<nonFilteredFileExtension>html</nonFilteredFileExtension>
+						<nonFilteredFileExtension>exe</nonFilteredFileExtension>
+						<nonFilteredFileExtension>bin</nonFilteredFileExtension>
                     </nonFilteredFileExtensions>
                 </configuration>
             </plugin>

jeecg-boot/run.bat

@@ -19,5 +19,6 @@ if not defined javaPath (
 set JAVA_HOME=%javaPath%
 set path2=%javaPath%\bin;%path%
 echo 开始启动
-call set path=%path2% && java -jar -Dfile.encoding=utf-8 -Dspring.profiles.active=local %jarPrefix%%jarPath%
+set opt=-XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:-OmitStackTraceInFastThrow -Dfile.encoding=UTF-8 -Djava.security.egd=file:/dev/./urandom -Dnetworkaddress.cache.ttl=10 -XX:MaxRAMPercentage=45 -XX:InitialRAMPercentage=45 -XX:+AlwaysPreTouch -Xss512k -XX:MaxDirectMemorySize=1024m -XX:MaxMetaspaceSize=384m -XX:ReservedCodeCacheSize=256m -XX:+DisableExplicitGC -XX:MaxGCPauseMillis=50 -XX:-UseBiasedLocking -XX:GuaranteedSafepointInterval=0 -XX:+UseCountedLoopSafepoints -XX:+SafepointTimeout -XX:SafepointTimeoutDelay=1000 -XX:StartFlightRecording=disk=true,maxsize=4096m,maxage=3d -XX:FlightRecorderOptions=maxchunksize=128m --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.base/java.time=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/jdk.internal.access=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
+call set path=%path2% && java -jar -Dfile.encoding=utf-8 -Dspring.profiles.active=local %opt% %jarPrefix%%jarPath%
 pause