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 c2a485a..fd7d07e 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
@@ -1075,38 +1075,44 @@
select
'体育教育' as 'key',a.d1 as '01',b.d2 as '02',c.d3 as '03',d.d4 as '04'
from
- (select round(round(sum(EDUSATI_TI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != ''),2))as d1 from bl_stu_answer where main_id = #{id} and nianji = '大一' )a,
- (select round(round(sum(EDUSATI_TI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != ''),2))as d2 from bl_stu_answer where main_id = #{id} and nianji = '大二' )b,
- (select round(round(sum(EDUSATI_TI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != ''),2))as d3 from bl_stu_answer where main_id = #{id} and nianji = '大三' )c,
- (select round(round(sum(EDUSATI_TI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != ''),2))as d4 from bl_stu_answer where main_id = #{id} and nianji = '大四' )d
+ (select round(round(sum(EDUSATI_TI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != '' and nianji = '大一'),2))as d1 from bl_stu_answer where main_id = #{id} and nianji = '大一' )a,
+ (select round(round(sum(EDUSATI_TI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != '' and nianji = '大二'),2))as d2 from bl_stu_answer where main_id = #{id} and nianji = '大二' )b,
+ (select round(round(sum(EDUSATI_TI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != '' and nianji = '大三'),2))as d3 from bl_stu_answer where main_id = #{id} and nianji = '大三' )c,
+ (select round(round(sum(EDUSATI_TI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != '' and nianji = '大四'),2))as d4 from bl_stu_answer where main_id = #{id} and nianji = '大四' )d
union all
select
'美育教育' as 'key',a.d1 as '01',b.d2 as '02',c.d3 as '03',d.d4 as '04'
from
- (select round(round(sum(EDUSATI_MEI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != ''),2))as d1 from bl_stu_answer where main_id = #{id} and nianji = '大一' )a,
- (select round(round(sum(EDUSATI_MEI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != ''),2))as d2 from bl_stu_answer where main_id = #{id} and nianji = '大二' )b,
- (select round(round(sum(EDUSATI_MEI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != ''),2))as d3 from bl_stu_answer where main_id = #{id} and nianji = '大三' )c,
- (select round(round(sum(EDUSATI_MEI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != ''),2))as d4 from bl_stu_answer where main_id = #{id} and nianji = '大四' )d
+ (select round(round(sum(EDUSATI_MEI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != '' and nianji = '大一'),2))as d1 from bl_stu_answer where main_id = #{id} and nianji = '大一' )a,
+ (select round(round(sum(EDUSATI_MEI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != '' and nianji = '大二'),2))as d2 from bl_stu_answer where main_id = #{id} and nianji = '大二' )b,
+ (select round(round(sum(EDUSATI_MEI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != '' and nianji = '大三'),2))as d3 from bl_stu_answer where main_id = #{id} and nianji = '大三' )c,
+ (select round(round(sum(EDUSATI_MEI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != '' and nianji = '大四'),2))as d4 from bl_stu_answer where main_id = #{id} and nianji = '大四' )d
union all
select
'劳动教育' as 'key',a.d1 as '01',b.d2 as '02',c.d3 as '03',d.d4 as '04'
from
- (select round(round(sum(EDUSATI_LAO2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != ''),2))as d1 from bl_stu_answer where main_id = #{id} and nianji = '大一' )a,
- (select round(round(sum(EDUSATI_LAO2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != ''),2))as d2 from bl_stu_answer where main_id = #{id} and nianji = '大二' )b,
- (select round(round(sum(EDUSATI_LAO2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != ''),2))as d3 from bl_stu_answer where main_id = #{id} and nianji = '大三' )c,
- (select round(round(sum(EDUSATI_LAO2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != ''),2))as d4 from bl_stu_answer where main_id = #{id} and nianji = '大四' )d
+ (select round(round(sum(EDUSATI_LAO2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != '' and nianji = '大一'),2))as d1 from bl_stu_answer where main_id = #{id} and nianji = '大一' )a,
+ (select round(round(sum(EDUSATI_LAO2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != '' and nianji = '大二'),2))as d2 from bl_stu_answer where main_id = #{id} and nianji = '大二' )b,
+ (select round(round(sum(EDUSATI_LAO2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != '' and nianji = '大三'),2))as d3 from bl_stu_answer where main_id = #{id} and nianji = '大三' )c,
+ (select round(round(sum(EDUSATI_LAO2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != '' and nianji = '大四'),2))as d4 from bl_stu_answer where main_id = #{id} and nianji = '大四' )d
+