From fb961e15a250595124e5dcc1e469ece705ffd770 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Tue, 24 Sep 2024 23:33:16 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B49=E6=9C=8824=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/BlStuAnswerMapper.xml          |  53 +--
 .../mapper/xml/BlTeacherAnswerMapper.xml      | 338 +++++++++---------
 .../impl/BlTeacherAnswerServiceImpl.java      |  34 +-
 .../blTeacherInfo/entity/BlTeacherInfo.java   |  14 +-
 4 files changed, 219 insertions(+), 220 deletions(-)

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 beed011..c2a485a 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
@@ -1046,60 +1046,63 @@
 
     <select id="b2_5_1" resultType="String">
         select
-        round(sum(EDUSATI_TI2)/count('x')) as '体育教育'
+        round(sum(EDUSATI_TI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != '')) as '体育教育'
         from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_5_2" resultType="String">
         select
-        round(sum(EDUSATI_MEI2)/count('x')) as '美育教育'
+        round(sum(EDUSATI_MEI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != '')) as '美育教育'
         from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="b2_5_3" resultType="String">
         select
-        round(sum(EDUSATI_LAO2)/count('x'))  as '劳动教育'
+        round(sum(EDUSATI_LAO2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != ''))  as '劳动教育'
         from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="i2_18" resultType="java.util.LinkedHashMap">
         select
-        '体美劳教育满意度' as 'key',
-        round(sum(EDUSATI_TI2)/count('x')) as '体育教育',
-        round(sum(EDUSATI_MEI2)/count('x')) as '美育教育',
-        round(sum(EDUSATI_LAO2)/count('x'))  as '劳动教育'
+            '体美劳教育满意度' as 'key',
+            round( sum( EDUSATI_TI2 ) / (select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != '') ) AS '体育教育',
+            round( sum( EDUSATI_MEI2 ) / (select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != '') ) AS '美育教育',
+            round( sum( EDUSATI_LAO2 ) / (select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != '') ) AS '劳动教育'
         from bl_stu_answer where main_id = #{id}
     </select>
 
     <select id="t2_19" resultType="java.util.LinkedHashMap">
-        select '体育教育' as 'key',a.d1 as '01',b.d2 as '02',c.d3 as '03',d.d4 as '04'
+        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)/count('x'),2))as d1 from bl_stu_answer where main_id = #{id} and nianji = '大一' )a,
-        (select round(round(sum(EDUSATI_TI2)/count('x'),2))as d2 from bl_stu_answer where main_id = #{id} and nianji = '大二' )b,
-        (select round(round(sum(EDUSATI_TI2)/count('x'),2))as d3 from bl_stu_answer where main_id = #{id} and nianji = '大三' )c,
-        (select round(round(sum(EDUSATI_TI2)/count('x'),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 != ''),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
         union all
-        select '美育教育' as 'key',a.d1 as '01',b.d2 as '02',c.d3 as '03',d.d4 as '04'
+        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)/count('x'),2))as d1 from bl_stu_answer where main_id = #{id} and nianji = '大一' )a,
-        (select round(round(sum(EDUSATI_MEI2)/count('x'),2))as d2 from bl_stu_answer where main_id = #{id} and nianji = '大二' )b,
-        (select round(round(sum(EDUSATI_MEI2)/count('x'),2))as d3 from bl_stu_answer where main_id = #{id} and nianji = '大三' )c,
-        (select round(round(sum(EDUSATI_MEI2)/count('x'),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 != ''),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
         union all
-        select '劳动教育' as 'key',a.d1 as '01',b.d2 as '02',c.d3 as '03',d.d4 as '04'
+        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)/count('x'),2))as d1 from bl_stu_answer where main_id = #{id} and nianji = '大一' )a,
-        (select round(round(sum(EDUSATI_LAO2)/count('x'),2))as d2 from bl_stu_answer where main_id = #{id} and nianji = '大二' )b,
-        (select round(round(sum(EDUSATI_LAO2)/count('x'),2))as d3 from bl_stu_answer where main_id = #{id} and nianji = '大三' )c,
-        (select round(round(sum(EDUSATI_LAO2)/count('x'),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 != ''),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>
 
     <select id="t2_20" resultType="java.util.LinkedHashMap">
         select
         major as 'key',
-        round(sum(EDUSATI_TI2)/count('x')) as '01',
-        round(sum(EDUSATI_MEI2)/count('x')) as '02',
-        round(sum(EDUSATI_LAO2)/count('x')) as '03'
+        round(sum(EDUSATI_TI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_TI2 is not null and EDUSATI_TI2 != '')) as '01',
+        round(sum(EDUSATI_MEI2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_MEI2 is not null and EDUSATI_MEI2 != '')) as '02',
+        round(sum(EDUSATI_LAO2)/(select count( 'x' ) from bl_stu_answer where main_id = #{id} and EDUSATI_LAO2 is not null and EDUSATI_LAO2 != '')) as '03'
         from bl_stu_answer where main_id = #{id}
         GROUP BY major
         HAVING count(*) > #{minNum}
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/mapper/xml/BlTeacherAnswerMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/mapper/xml/BlTeacherAnswerMapper.xml
index 65297d1..c65fde2 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/mapper/xml/BlTeacherAnswerMapper.xml
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/mapper/xml/BlTeacherAnswerMapper.xml
@@ -48,7 +48,7 @@
     <select id="getSelectGwlxjg" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select a.POSITIONTYPE,a.POSITIONTYPE_cnt as cnt,format(round(a.POSITIONTYPE_cnt/b.total_cnt,2)*100,0) as num from
         (select POSITIONTYPE,count('x') as POSITIONTYPE_cnt from bl_teacher_answer where main_id = #{id} GROUP BY POSITIONTYPE order by POSITIONTYPE) a,
-        (select count('x') as total_cnt from bl_teacher_answer where main_id = #{id} ) b where POSITIONTYPE = '科研型'
+        (select count('x') as total_cnt from bl_teacher_answer where main_id = #{id} ) b where POSITIONTYPE = '教学科研型'
         union all
         select a.POSITIONTYPE,a.POSITIONTYPE_cnt as cnt,format(round(a.POSITIONTYPE_cnt/b.total_cnt,2)*100,0) as num from
         (select POSITIONTYPE,count('x') as POSITIONTYPE_cnt from bl_teacher_answer where main_id = #{id}  GROUP BY POSITIONTYPE order by POSITIONTYPE) a,
@@ -117,21 +117,21 @@
     <select id="getSelectBtlxSdsf" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select '依法依规，履行教师职责' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(SDSF_YFYG2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(SDSF_YFYG2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(SDSF_YFYG2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(SDSF_YFYG2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(SDSF_YFYG2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '关心爱护学生' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(SDSF_GXAH2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(SDSF_GXAH2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(SDSF_GXAH2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(SDSF_GXAH2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(SDSF_GXAH2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '精神面貌及品德修养良好' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(SDSF_JSMM2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(SDSF_JSMM2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(SDSF_JSMM2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(SDSF_JSMM2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(SDSF_JSMM2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
@@ -229,42 +229,42 @@
     <select id="getSelectBtgwlxjsjbxwhp" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select '热爱工作，能以最大的热情投身教育行业，积极主动学习' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(BEHAVIOR_PASSION2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )a,
+        (select format(sum(BEHAVIOR_PASSION2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学科研型' )a,
         (select format(sum(BEHAVIOR_PASSION2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学型' )b,
         (select format(sum(BEHAVIOR_PASSION2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )c,
         (select format(sum(BEHAVIOR_PASSION2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '辅导员' )d
         union all
         select '关爱学生，积极帮助学生解决生活或学习上的困难' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(BEHAVIOR_SOLVE2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )a,
+        (select format(sum(BEHAVIOR_SOLVE2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学科研型' )a,
         (select format(sum(BEHAVIOR_SOLVE2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学型' )b,
         (select format(sum(BEHAVIOR_SOLVE2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )c,
         (select format(sum(BEHAVIOR_SOLVE2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '辅导员' )d
         union all
         select '关注学生的心理健康状况' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(BEHAVIOR_MENTAL2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )a,
+        (select format(sum(BEHAVIOR_MENTAL2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学科研型' )a,
         (select format(sum(BEHAVIOR_MENTAL2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学型' )b,
         (select format(sum(BEHAVIOR_MENTAL2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )c,
         (select format(sum(BEHAVIOR_MENTAL2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '辅导员' )d
         union all
         select '教学有序，有清晰合理的教学目标并能清楚地向学生解释' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(BEHAVIOR_AIM2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )a,
+        (select format(sum(BEHAVIOR_AIM2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学科研型' )a,
         (select format(sum(BEHAVIOR_AIM2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学型' )b,
         (select format(sum(BEHAVIOR_AIM2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )c,
         (select format(sum(BEHAVIOR_AIM2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '辅导员' )d
         union all
         select '育人有方，激发学生的学习兴趣，注重培养学生的创新精神和创新思维' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(BEHAVIOR_CREATE2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )a,
+        (select format(sum(BEHAVIOR_CREATE2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学科研型' )a,
         (select format(sum(BEHAVIOR_CREATE2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学型' )b,
         (select format(sum(BEHAVIOR_CREATE2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )c,
         (select format(sum(BEHAVIOR_CREATE2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '辅导员' )d
         union all
         select '以身作则，信守承诺' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(BEHAVIOR_COMMIT2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )a,
+        (select format(sum(BEHAVIOR_COMMIT2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学科研型' )a,
         (select format(sum(BEHAVIOR_COMMIT2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '教学型' )b,
         (select format(sum(BEHAVIOR_COMMIT2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '科研型' )c,
         (select format(sum(BEHAVIOR_COMMIT2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and POSITIONTYPE = '辅导员' )d
@@ -372,27 +372,27 @@
     <!--    不同岗位类型教师对教学能力的评价-->
     <select id="getSelectBtgwlxjsdjxnlpj" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         SELECT '教学认知能力' as lsname,
-        max(CASE POSITIONTYPE = '科研型' WHEN '科研型' THEN (select format(sum(SKILL_KNOW2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' GROUP BY POSITIONTYPE) END) AS tj1,
+        max(CASE POSITIONTYPE = '教学科研型' WHEN '教学科研型' THEN (select format(sum(SKILL_KNOW2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' GROUP BY POSITIONTYPE) END) AS tj1,
         max(CASE POSITIONTYPE = '教学型' WHEN '教学型' THEN (select format(sum(SKILL_KNOW2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' GROUP BY POSITIONTYPE) END) AS tj2
         FROM bl_teacher_answer where main_id = #{id}
         union ALL
         SELECT '教学设计能力' as lsname,
-        max(CASE POSITIONTYPE = '科研型' WHEN '科研型' THEN (select format(sum(SKILL_DESIGN2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' GROUP BY POSITIONTYPE) END) AS tj1,
+        max(CASE POSITIONTYPE = '教学科研型' WHEN '教学科研型' THEN (select format(sum(SKILL_DESIGN2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' GROUP BY POSITIONTYPE) END) AS tj1,
         max(CASE POSITIONTYPE = '教学型' WHEN '教学型' THEN (select format(sum(SKILL_DESIGN2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' GROUP BY POSITIONTYPE) END) AS tj2
         FROM bl_teacher_answer where main_id = #{id}
         union ALL
         SELECT '教学调控能力' as lsname,
-        max(CASE POSITIONTYPE = '科研型' WHEN '科研型' THEN (select format(sum(SKILL_CTRL2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' GROUP BY POSITIONTYPE) END) AS tj1,
+        max(CASE POSITIONTYPE = '教学科研型' WHEN '教学科研型' THEN (select format(sum(SKILL_CTRL2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' GROUP BY POSITIONTYPE) END) AS tj1,
         max(CASE POSITIONTYPE = '教学型' WHEN '教学型' THEN (select format(sum(SKILL_CTRL2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' GROUP BY POSITIONTYPE) END) AS tj2
         FROM bl_teacher_answer where main_id = #{id}
         union ALL
         SELECT '教学评价能力' as lsname,
-        max(CASE POSITIONTYPE = '科研型' WHEN '科研型' THEN (select format(sum(SKILL_ASSESS2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' GROUP BY POSITIONTYPE) END) AS tj1,
+        max(CASE POSITIONTYPE = '教学科研型' WHEN '教学科研型' THEN (select format(sum(SKILL_ASSESS2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' GROUP BY POSITIONTYPE) END) AS tj1,
         max(CASE POSITIONTYPE = '教学型' WHEN '教学型' THEN (select format(sum(SKILL_ASSESS2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' GROUP BY POSITIONTYPE) END) AS tj2
         FROM bl_teacher_answer where main_id = #{id}
         union ALL
         SELECT '运用媒介能力' as lsname,
-        max(CASE POSITIONTYPE = '科研型' WHEN '科研型' THEN (select format(sum(SKILL_TECH2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' GROUP BY POSITIONTYPE) END) AS tj1,
+        max(CASE POSITIONTYPE = '教学科研型' WHEN '教学科研型' THEN (select format(sum(SKILL_TECH2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' GROUP BY POSITIONTYPE) END) AS tj1,
         max(CASE POSITIONTYPE = '教学型' WHEN '教学型' THEN (select format(sum(SKILL_TECH2)/count('x'),2) from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' GROUP BY POSITIONTYPE) END) AS tj2
         FROM bl_teacher_answer where main_id = #{id}
     </select>
@@ -469,23 +469,23 @@
 
     <!--    不同岗位类型教师在各项工作上的平均时间投入-->
     <select id="getSelectBtgwlxpjsjTjt" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
-        select '科研型' as lsname,
-               format(round(sum(SPEND_RESEARCH)/count('x'),2),0) as tj1,
-               format(round(sum(SPEND_PREPARE)/count('x'),2),0) as tj2,
-               format(round(sum(SPEND_TEACH)/count('x'),2),0) as tj3,
-               format(round(sum(SPEND_COACH)/count('x'),2),0) as tj4,
-               format(round(sum(SPEND_MEETING)/count('x'),2),0) as tj5,
-               format(round(sum(SPEND_PARTTIME)/count('x'),2),0) as tj6
+        select '教学科研型' as lsname,
+        format(round(sum(SPEND_RESEARCH)/count('x'),2),0) as tj1,
+        format(round(sum(SPEND_PREPARE)/count('x'),2),0) as tj2,
+        format(round(sum(SPEND_TEACH)/count('x'),2),0) as tj3,
+        format(round(sum(SPEND_COACH)/count('x'),2),0) as tj4,
+        format(round(sum(SPEND_MEETING)/count('x'),2),0) as tj5,
+        format(round(sum(SPEND_PARTTIME)/count('x'),2),0) as tj6
         from bl_teacher_answer
-        where main_id = #{id} and POSITIONTYPE = '科研型'
+        where main_id = #{id} and POSITIONTYPE = '教学科研型'
         union ALL
         select '教学型' as lsname,
-               format(round(sum(SPEND_RESEARCH)/count('x'),2),0) as tj1,
-               format(round(sum(SPEND_PREPARE)/count('x'),2),0) as tj2,
-               format(round(sum(SPEND_TEACH)/count('x'),2),0) as tj3,
-               format(round(sum(SPEND_COACH)/count('x'),2),0) as tj4,
-               format(round(sum(SPEND_MEETING)/count('x'),2),0) as tj5,
-               format(round(sum(SPEND_PARTTIME)/count('x'),2),0) as tj6
+        format(round(sum(SPEND_RESEARCH)/count('x'),2),0) as tj1,
+        format(round(sum(SPEND_PREPARE)/count('x'),2),0) as tj2,
+        format(round(sum(SPEND_TEACH)/count('x'),2),0) as tj3,
+        format(round(sum(SPEND_COACH)/count('x'),2),0) as tj4,
+        format(round(sum(SPEND_MEETING)/count('x'),2),0) as tj5,
+        format(round(sum(SPEND_PARTTIME)/count('x'),2),0) as tj6
         from bl_teacher_answer
         where main_id = #{id} and POSITIONTYPE = '教学型'
     </select>
@@ -548,7 +548,7 @@
         concat(format(round(sum(JSKC_GNJ)/count('x'),2)*100,0),'%') as tj2,
         concat(format(round(sum(JSKC_ZYXXK)/count('x'),2)*100,0),'%') as tj3,
         concat(format(round(sum(JSKC_GGTS)/count('x'),2)*100,0),'%') as tj4
-        from bl_teacher_answer where  main_id = #{id} and POSITIONTYPE = '科研型'
+        from bl_teacher_answer where  main_id = #{id} and POSITIONTYPE = '教学科研型'
     </select>
 
     <!--    教学任务分配情况百分比-->
@@ -558,44 +558,44 @@
         concat(format(round(sum(JSKC_ZYXXK)/count('x'),2)*100,0),'%') as tj3,
         concat(format(round(sum(JSKC_GGTS)/count('x'),2)*100,0),'%') as tj4
         from bl_teacher_answer where  main_id = #{id}  and POSITIONTYPE not in ('辅导员','科研型')
---                                  and POSITIONTYPE = '科研型'
+--                                  and POSITIONTYPE = '教学科研型'
     </select>
     <!--    教师在各类教学任务分配比例-->
     <select id="getSelectJszgljxrwfpbl" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select * from (
         select '低年级本科专业必修课' as lsname,format(round(sum(JSKC_DNJ)/count('x'),2)*100,0) as tj1 from bl_teacher_answer where main_id = #{id}  and POSITIONTYPE not in ('辅导员','科研型')
---                                                                                                                       and  POSITIONTYPE = '科研型'
+--                                                                                                                       and  POSITIONTYPE = '教学科研型'
         union all
         select '专业选修课' as lsname,format(round(sum(JSKC_ZYXXK)/count('x'),2)*100,0) as tj1  from bl_teacher_answer where main_id = #{id}  and POSITIONTYPE not in ('辅导员','科研型')
---                                                                                                                     and  POSITIONTYPE = '科研型'
+--                                                                                                                     and  POSITIONTYPE = '教学科研型'
         union all
         select '研究生课程' as lsname,format(round(sum(JSKC_YJS)/count('x'),2)*100,0) as tj1  from bl_teacher_answer where main_id = #{id}  and POSITIONTYPE not in ('辅导员','科研型')
---                                                                                                                   and  POSITIONTYPE = '科研型'
+--                                                                                                                   and  POSITIONTYPE = '教学科研型'
         union all
         select '高年级本科专业必修课' as lsname,format(round(sum(JSKC_GNJ)/count('x'),2)*100,0) as tj1  from bl_teacher_answer where main_id = #{id}  and POSITIONTYPE not in ('辅导员','科研型')
---                                                                                                                        and  POSITIONTYPE = '科研型'
+--                                                                                                                        and  POSITIONTYPE = '教学科研型'
         union all
         select '公共通识课程' as lsname,format(round(sum(JSKC_GGTS)/count('x'),2)*100,0) as tj1  from bl_teacher_answer where main_id = #{id}  and POSITIONTYPE not in ('辅导员','科研型')
---                                                                                                                     and  POSITIONTYPE = '科研型'
+--                                                                                                                     and  POSITIONTYPE = '教学科研型'
         ) t order by tj1 asc
     </select>
     <!--    不同岗位类型教师在各项工作上的平均时间投入-->
     <select id="getSelectBtgwlxjszgxgzrdpjsjtr" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
-        select '科研型' as lsname,
-               format(round(sum(JSKC_YJS)/count('x'),2)*100,0) as tj1,
-               format(round(sum(JSKC_ZYXXK)/count('x'),2)*100,0) as tj2,
-               format(round(sum(JSKC_DNJ)/count('x'),2)*100,0) as tj3,
-               format(round(sum(JSKC_GNJ)/count('x'),2)*100,0) as tj4,
-               format(round(sum(JSKC_GGTS)/count('x'),2)*100,0) as tj5
+        select '教学科研型' as lsname,
+        format(round(sum(JSKC_YJS)/count('x'),2)*100,0) as tj1,
+        format(round(sum(JSKC_ZYXXK)/count('x'),2)*100,0) as tj2,
+        format(round(sum(JSKC_DNJ)/count('x'),2)*100,0) as tj3,
+        format(round(sum(JSKC_GNJ)/count('x'),2)*100,0) as tj4,
+        format(round(sum(JSKC_GGTS)/count('x'),2)*100,0) as tj5
         from bl_teacher_answer
-        where main_id = #{id} and POSITIONTYPE = '科研型'
+        where main_id = #{id} and POSITIONTYPE = '教学科研型'
         union ALL
         select '教学型' as lsname,
-               format(round(sum(JSKC_YJS)/count('x'),2)*100,0) as tj1,
-               format(round(sum(JSKC_ZYXXK)/count('x'),2)*100,0) as tj2,
-               format(round(sum(JSKC_DNJ)/count('x'),2)*100,0) as tj3,
-               format(round(sum(JSKC_GNJ)/count('x'),2)*100,0) as tj4,
-               format(round(sum(JSKC_GGTS)/count('x'),2)*100,0) as tj5
+        format(round(sum(JSKC_YJS)/count('x'),2)*100,0) as tj1,
+        format(round(sum(JSKC_ZYXXK)/count('x'),2)*100,0) as tj2,
+        format(round(sum(JSKC_DNJ)/count('x'),2)*100,0) as tj3,
+        format(round(sum(JSKC_GNJ)/count('x'),2)*100,0) as tj4,
+        format(round(sum(JSKC_GGTS)/count('x'),2)*100,0) as tj5
         from bl_teacher_answer
         where main_id = #{id} and POSITIONTYPE = '教学型'
     </select>
@@ -673,21 +673,21 @@
     </select>
     <!--    不同岗位类型教师课程教学融入思政元素的方式-->
     <select id="getSelectBtgwlxjskcjxrrszys" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
-        select '科研型' as lsname,
-               format(round(sum(RRFS_COURSE)/count('x'),2)*100,0) as tj1,
-               format(round(sum(RRFS_DISCUSS)/count('x'),2)*100,0) as tj2,
-               format(round(sum(RRFS_WORK)/count('x'),2)*100,0) as tj3,
-               format(round(sum(RRFS_INTERN)/count('x'),2)*100,0) as tj4,
-               format(round(sum(RRFS_NO)/count('x'),2)*100,0) as tj5
+        select '教学科研型' as lsname,
+        format(round(sum(RRFS_COURSE)/count('x'),2)*100,0) as tj1,
+        format(round(sum(RRFS_DISCUSS)/count('x'),2)*100,0) as tj2,
+        format(round(sum(RRFS_WORK)/count('x'),2)*100,0) as tj3,
+        format(round(sum(RRFS_INTERN)/count('x'),2)*100,0) as tj4,
+        format(round(sum(RRFS_NO)/count('x'),2)*100,0) as tj5
         from bl_teacher_answer
-        where main_id = #{id} and POSITIONTYPE = '科研型'
+        where main_id = #{id} and POSITIONTYPE = '教学科研型'
         union ALL
         select '教学型' as lsname,
-               format(round(sum(RRFS_COURSE)/count('x'),2)*100,0) as tj1,
-               format(round(sum(RRFS_DISCUSS)/count('x'),2)*100,0) as tj2,
-               format(round(sum(RRFS_WORK)/count('x'),2)*100,0) as tj3,
-               format(round(sum(RRFS_INTERN)/count('x'),2)*100,0) as tj4,
-               format(round(sum(RRFS_NO)/count('x'),2)*100,0) as tj5
+        format(round(sum(RRFS_COURSE)/count('x'),2)*100,0) as tj1,
+        format(round(sum(RRFS_DISCUSS)/count('x'),2)*100,0) as tj2,
+        format(round(sum(RRFS_WORK)/count('x'),2)*100,0) as tj3,
+        format(round(sum(RRFS_INTERN)/count('x'),2)*100,0) as tj4,
+        format(round(sum(RRFS_NO)/count('x'),2)*100,0) as tj5
         from bl_teacher_answer
         where main_id = #{id} and POSITIONTYPE = '教学型'
     </select>
@@ -749,12 +749,12 @@
                format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,
                format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,
                format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and ZYK_SKILL = '非常符合')a,
-        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and ZYK_SKILL = '比较符合')b,
-        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_SKILL = '一般')c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_SKILL = '比较不符合')d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_SKILL = '非常不符合')e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id})f
+        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_SKILL = '非常符合')a,
+        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_SKILL = '比较符合')b,
+        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_SKILL = '一般')c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_SKILL = '比较不符合')d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_SKILL = '非常不符合')e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))f
         union all
         select '高阶性' as des,'课程教学培养了我解决复杂问题的综合能力' as lsname,
                format(round(a.fc_cnt/f.tot_cnt,2)*100,0) as tj1,
@@ -762,12 +762,12 @@
                format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,
                format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,
                format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and ZYK_PROBLEM = '非常符合')a,
-        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and ZYK_PROBLEM = '比较符合')b,
-        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_PROBLEM = '一般')c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_PROBLEM = '比较不符合')d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_PROBLEM = '非常不符合')e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id})f
+        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_PROBLEM = '非常符合')a,
+        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_PROBLEM = '比较符合')b,
+        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_PROBLEM = '一般')c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_PROBLEM = '比较不符合')d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_PROBLEM = '非常不符合')e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))f
         union all
         select '创新性' as des,'课程内容注重学科间的交叉与融合' as lsname,
                format(round(a.fc_cnt/f.tot_cnt,2)*100,0) as tj1,
@@ -775,12 +775,12 @@
                format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,
                format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,
                format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and ZYK_CROSS = '非常符合')a,
-        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and ZYK_CROSS = '比较符合')b,
-        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_CROSS = '一般')c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_CROSS = '比较不符合')d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_CROSS = '非常不符合')e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id})f
+        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_CROSS = '非常符合')a,
+        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_CROSS = '比较符合')b,
+        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_CROSS = '一般')c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_CROSS = '比较不符合')d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_CROSS = '非常不符合')e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))f
         union all
         select '创新性' as des,'课程内容反映了学科发展的前沿内容' as lsname,
                format(round(a.fc_cnt/f.tot_cnt,2)*100,0) as tj1,
@@ -788,12 +788,12 @@
                format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,
                format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,
                format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and ZYK_NEW = '非常符合')a,
-        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and ZYK_NEW = '比较符合')b,
-        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_NEW = '一般')c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_NEW = '比较不符合')d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_NEW = '非常不符合')e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id})f
+        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_NEW = '非常符合')a,
+        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_NEW = '比较符合')b,
+        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_NEW = '一般')c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_NEW = '比较不符合')d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_NEW = '非常不符合')e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))f
         union all
         select '创新性' as des,'课程教学内容重视实践与理论的结合' as lsname,
                format(round(a.fc_cnt/f.tot_cnt,2)*100,0) as tj1,
@@ -801,12 +801,12 @@
                format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,
                format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,
                format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and ZYK_INTERN = '非常符合')a,
-        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and ZYK_INTERN = '比较符合')b,
-        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_INTERN = '一般')c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_INTERN = '比较不符合')d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_INTERN = '非常不符合')e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id})f
+        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_INTERN = '非常符合')a,
+        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_INTERN = '比较符合')b,
+        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_INTERN = '一般')c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_INTERN = '比较不符合')d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_INTERN = '非常不符合')e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))f
         union all
         select '挑战度' as des,'需要非常努力才能达到课程要求' as lsname,
                format(round(a.fc_cnt/f.tot_cnt,2)*100,0) as tj1,
@@ -814,12 +814,12 @@
                format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,
                format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,
                format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and ZYK_EFFORT = '非常符合')a,
-        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and ZYK_EFFORT = '比较符合')b,
-        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_EFFORT = '一般')c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_EFFORT = '比较不符合')d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and ZYK_EFFORT = '非常不符合')e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id})f
+        (select count('x') as fc_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_EFFORT = '非常符合')a,
+        (select count('x') as bj_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_EFFORT = '比较符合')b,
+        (select count('x') as yb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_EFFORT = '一般')c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_EFFORT = '比较不符合')d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') and ZYK_EFFORT = '非常不符合')e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))f
         ) t order by tj1 asc
     </select>
 
@@ -827,53 +827,53 @@
     <select id="getSelectKclxydLdt" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select
             format(sum(ZYK_SKILL2)/count('x'),2) as tj1,
-        format(sum(ZYK_PROBLEM2)/count('x'),2) as tj2,
-        format(sum(ZYK_CROSS2)/count('x'),2) as tj3,
-        format(sum(ZYK_NEW2)/count('x'),2) as tj4,
-        format(sum(ZYK_INTERN2)/count('x'),2) as tj5,
-        format(sum(ZYK_EFFORT2)/count('x'),2) as tj6
-        from bl_teacher_answer where main_id = #{id}  and POSITIONTYPE not in ('辅导员','科研型')
+            format(sum(ZYK_PROBLEM2)/count('x'),2) as tj2,
+            format(sum(ZYK_CROSS2)/count('x'),2) as tj3,
+            format(sum(ZYK_NEW2)/count('x'),2) as tj4,
+            format(sum(ZYK_INTERN2)/count('x'),2) as tj5,
+            format(sum(ZYK_EFFORT2)/count('x'),2) as tj6
+        from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型')
     </select>
     <!--   不同岗位类型教师在课程“两性一度”的实施情况-->
     <select id="getSelectkclxydbtgwlx" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select '高阶性' as lsname2,'课程将知识、能力、素养进行了有机融合' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(ZYK_SKILL2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )a,
+        (select format(sum(ZYK_SKILL2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' )a,
         (select format(sum(ZYK_SKILL2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' )b,
         (select format(sum(ZYK_SKILL2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )c,
         (select format(sum(ZYK_SKILL2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '辅导员' )d
         union all
         select '高阶性' as lsname2, '课程教学培养了学生解决复杂问题的综合能力' as lsname,a.d1 as '师德师风',b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(ZYK_PROBLEM2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )a,
+        (select format(sum(ZYK_PROBLEM2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' )a,
         (select format(sum(ZYK_PROBLEM2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' )b,
         (select format(sum(ZYK_PROBLEM2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )c,
         (select format(sum(ZYK_PROBLEM2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '辅导员' )d
         union all
         select '创新性' as lsname2, '课程内容注重学科间的交叉与融合' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(ZYK_CROSS2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )a,
+        (select format(sum(ZYK_CROSS2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' )a,
         (select format(sum(ZYK_CROSS2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' )b,
         (select format(sum(ZYK_CROSS2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )c,
         (select format(sum(ZYK_CROSS2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '辅导员' )d
         union all
         select '创新性' as lsname2, '课程内容反映了学科发展的前沿内容' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(ZYK_NEW2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )a,
+        (select format(sum(ZYK_NEW2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' )a,
         (select format(sum(ZYK_NEW2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' )b,
         (select format(sum(ZYK_NEW2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )c,
         (select format(sum(ZYK_NEW2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '辅导员' )d
         union all
         select '创新性' as lsname2, '课程教学内容重视实践与理论的结合' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(ZYK_INTERN2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )a,
+        (select format(sum(ZYK_INTERN2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' )a,
         (select format(sum(ZYK_INTERN2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' )b,
         (select format(sum(ZYK_INTERN2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )c,
         (select format(sum(ZYK_INTERN2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '辅导员' )d
         union all
         select '挑战度' as lsname2, '学生需要非常努力才能达到课程要求' as lsname,a.d1 as lsname,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(ZYK_EFFORT2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )a,
+        (select format(sum(ZYK_EFFORT2)/count('x'),2)as d1 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学科研型' )a,
         (select format(sum(ZYK_EFFORT2)/count('x'),2)as d2 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '教学型' )b,
         (select format(sum(ZYK_EFFORT2)/count('x'),2)as d3 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '科研型' )c,
         (select format(sum(ZYK_EFFORT2)/count('x'),2)as d4 from bl_teacher_answer where main_id = #{id} and  POSITIONTYPE = '辅导员' )d
@@ -933,7 +933,7 @@
                format(sum(ZYK_NEW2)/count('x'),2) as tj4,
                format(sum(ZYK_INTERN2)/count('x'),2) as tj5,
                format(sum(ZYK_EFFORT2)/count('x'),2) as tj6
-        from bl_teacher_answer where main_id = #{id} GROUP BY DEPARTMENT HAVING count(*) > ${minNum} ORDER BY to_pinyin(DEPARTMENT) asc
+        from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型') GROUP BY DEPARTMENT HAVING count(*) > ${minNum} ORDER BY to_pinyin(DEPARTMENT) asc
     </select>
     <!--   践行“成果导向”理念-->
     <select id="getSelectcgdxln1" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
@@ -963,14 +963,14 @@
 
     <!--   不同岗位类型教师评价“成果导向”理念的落实情况-->
     <select id="getSelectcgdxTjt2" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
-        select '科研型' as lsname,
+        select '教学科研型' as lsname,
                format(round(sum(LINIAN_ZJGJ)/count('x'),2)*100,0) as tj1,
                format(round(sum(LINIAN_PYMB)/count('x'),2)*100,0) as tj2,
                format(round(sum(LINIAN_PYFA)/count('x'),2)*100,0) as tj3,
                format(round(sum(LINIAN_XSZX)/count('x'),2)*100,0) as tj4,
                format(round(sum(LINIAN_BYYQ)/count('x'),2)*100,0) as tj5
         from bl_teacher_answer
-        where POSITIONTYPE = '科研型' and main_id = #{id}
+        where POSITIONTYPE = '教学科研型' and main_id = #{id}
         union ALL
         select '教学型' as lsname,
                format(round(sum(LINIAN_ZJGJ)/count('x'),2)*100,0) as tj1,
@@ -1061,7 +1061,7 @@
 
     <!--   不同职称教师在各项工作上的平均时间投入-->
     <select id="getSelectsshdTjt2" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
-        select '科研型' as lsname,
+        select '教学科研型' as lsname,
                 format(round(sum(EXCHANGE_ZDKC)/count('x'),2)*100,0) as tj1,<!-- 指导课程 1答疑课程内容、指导课程作业-->
                 format(round(sum(EXCHANGE_ZDLW)/count('x'),2)*100,0) as tj2,<!-- 指导论文 2指导学期、学年和毕业论文-->
                 format(round(sum(EXCHANGE_XLJK)/count('x'),2)*100,0) as tj3,<!-- 心里健康 3关注学生的心里健康状况-->
@@ -1069,7 +1069,7 @@
                 format(round(sum(EXCHANGE_ZDXM)/count('x'),2)*100,0) as tj5,<!-- 指导项目 5指导学生从事研究项目和竞赛活动-->
                 format(round(sum(EXCHANGE_ZYGH)/count('x'),2)*100,0) as tj6 <!-- 职业规划 6指导学生职业生涯规划与就业创业-->
         from bl_teacher_answer
-        where POSITIONTYPE = '科研型' and main_id = #{id}
+        where POSITIONTYPE = '教学科研型' and main_id = #{id}
         union ALL
         select '教学型' as lsname,
                 format(round(sum(EXCHANGE_ZDKC)/count('x'),2)*100,0) as tj1,<!-- 指导课程 1答疑课程内容、指导课程作业-->
@@ -1226,28 +1226,28 @@
     <select id="getSelectsshd5" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select '课前运用网络课程平台、教材或资料进行自主预学，梳理知识并发现问题' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(PRE_CLASS_PREVIEW2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(PRE_CLASS_PREVIEW2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(PRE_CLASS_PREVIEW2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(PRE_CLASS_PREVIEW2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(PRE_CLASS_PREVIEW2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '课堂上能跟上老师的讲解，主动提问或参与讨论，每节课学有所获' as lsname,a.d1 as '师德师风',b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(IN_CLASS_QUESTIONS2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(IN_CLASS_QUESTIONS2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(IN_CLASS_QUESTIONS2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(IN_CLASS_QUESTIONS2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(IN_CLASS_QUESTIONS2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '课后复习笔记及总结课堂教学相关知识' as '具体方面',a.d1 as lsname,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(AFTER_CLASS_SUMMARY2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(AFTER_CLASS_SUMMARY2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(AFTER_CLASS_SUMMARY2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(AFTER_CLASS_SUMMARY2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(AFTER_CLASS_SUMMARY2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '除了阅读教材，还延伸阅读教师推荐的其他相关书目' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(AFTER_CLASS_READ2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(AFTER_CLASS_READ2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(AFTER_CLASS_READ2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(AFTER_CLASS_READ2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(AFTER_CLASS_READ2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
@@ -1358,28 +1358,28 @@
     <select id="getSelectjsfz3" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select '学校重视教师培训与职业发展，相关制度完善' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(round(sum(TRAIN_SYSTEM2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(round(sum(TRAIN_SYSTEM2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(round(sum(TRAIN_SYSTEM2)/count('x'),2),0)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(round(sum(TRAIN_SYSTEM2)/count('x'),2),0)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(round(sum(TRAIN_SYSTEM2)/count('x'),2),0)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '教师发展举措得力，老教授“传帮带”作用充分发挥' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(round(sum(TRAIN_TEACH2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(round(sum(TRAIN_TEACH2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(round(sum(TRAIN_TEACH2)/count('x'),2),0)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(round(sum(TRAIN_TEACH2)/count('x'),2),0)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(round(sum(TRAIN_TEACH2)/count('x'),2),0)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '教师培训内容丰富，对教学和对职业发展有帮助' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(round(sum(TRAIN_DEVELOP2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(round(sum(TRAIN_DEVELOP2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(round(sum(TRAIN_DEVELOP2)/count('x'),2),0)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(round(sum(TRAIN_DEVELOP2)/count('x'),2),0)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(round(sum(TRAIN_DEVELOP2)/count('x'),2),0)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '国际交流与培训活动' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(round(sum(TRAIN_GLOBAL2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(round(sum(TRAIN_GLOBAL2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(round(sum(TRAIN_GLOBAL2)/count('x'),2),0)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(round(sum(TRAIN_GLOBAL2)/count('x'),2),0)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(round(sum(TRAIN_GLOBAL2)/count('x'),2),0)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
@@ -1487,42 +1487,42 @@
     <select id="getSelectzyfwyzc3" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select '我清楚自己的岗位职责和要求' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(DEDICATION_STANDARD2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(DEDICATION_STANDARD2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(DEDICATION_STANDARD2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(DEDICATION_STANDARD2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(DEDICATION_STANDARD2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '我周围的教授同事们都为本科生上课' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(DEDICATION_HIGH2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(DEDICATION_HIGH2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(DEDICATION_HIGH2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(DEDICATION_HIGH2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(DEDICATION_HIGH2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '我和同事们都很乐意开展教学研究和改革' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(DEDICATION_DEVELOP2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(DEDICATION_DEVELOP2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(DEDICATION_DEVELOP2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(DEDICATION_DEVELOP2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(DEDICATION_DEVELOP2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '我和同事们都注重将科研成果融入教学' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(DEDICATION_RESEARCH2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(DEDICATION_RESEARCH2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(DEDICATION_RESEARCH2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(DEDICATION_RESEARCH2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(DEDICATION_RESEARCH2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '我和同事们都注重提升产学研用能力' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(DEDICATION_APPLY2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(DEDICATION_APPLY2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(DEDICATION_APPLY2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(DEDICATION_APPLY2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(DEDICATION_APPLY2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '我和同事们的教学和科研投入分配合理' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(DEDICATION_DISTRIBUTION2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(DEDICATION_DISTRIBUTION2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(DEDICATION_DISTRIBUTION2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(DEDICATION_DISTRIBUTION2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(DEDICATION_DISTRIBUTION2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
@@ -1650,42 +1650,42 @@
     <select id="getSelectjxpjgz3" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select '教学评价体现学生中心，突出产出导向' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(TEACHING_RESULT2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(TEACHING_RESULT2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(TEACHING_RESULT2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(TEACHING_RESULT2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(TEACHING_RESULT2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '评价方式多样，评价主体多元，评价指标科学、具体可测' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(TEACHING_INDEX2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(TEACHING_INDEX2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(TEACHING_INDEX2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(TEACHING_INDEX2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(TEACHING_INDEX2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '教学评价针对性地改进了我的教学内容和方法' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(TEACHING_EFFECT2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(TEACHING_EFFECT2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(TEACHING_EFFECT2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(TEACHING_EFFECT2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(TEACHING_EFFECT2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '教学评价促进了学生学习效果的提升' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(TEACHING_STUDENT2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(TEACHING_STUDENT2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(TEACHING_STUDENT2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(TEACHING_STUDENT2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(TEACHING_STUDENT2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '教学督导员的督导对我的教学工作帮助很大' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(TEACHING_SUPERVISE2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(TEACHING_SUPERVISE2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(TEACHING_SUPERVISE2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(TEACHING_SUPERVISE2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(TEACHING_SUPERVISE2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '学校教学激励制度完善，并促进了教师的教学积极性' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(sum(TEACHING_AWARDS2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(sum(TEACHING_AWARDS2)/count('x'),2)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(sum(TEACHING_AWARDS2)/count('x'),2)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(sum(TEACHING_AWARDS2)/count('x'),2)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(sum(TEACHING_AWARDS2)/count('x'),2)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
@@ -1750,44 +1750,44 @@
     <select id="getSelectzytjpj1" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select * from (
         select '图书馆资源' as lsname,format(round(a.fc_cnt/f.tot_cnt,2)*100,0) as tj1,format(round(b.bj_cnt/f.tot_cnt,2)*100,0) as tj2,format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where SATI_LIBRARY ='非常满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))a,
-        (select count('x') as bj_cnt from bl_teacher_answer where SATI_LIBRARY ='比较满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))b,
-        (select count('x') as yb_cnt from bl_teacher_answer where SATI_LIBRARY ='一般' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where SATI_LIBRARY ='比较不满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where SATI_LIBRARY ='非常不符合' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型')) f
+        (select count('x') as fc_cnt from bl_teacher_answer where SATI_LIBRARY ='非常满意' and main_id = #{id})a,
+        (select count('x') as bj_cnt from bl_teacher_answer where SATI_LIBRARY ='比较满意' and main_id = #{id})b,
+        (select count('x') as yb_cnt from bl_teacher_answer where SATI_LIBRARY ='一般' and main_id = #{id})c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where SATI_LIBRARY ='比较不满意' and main_id = #{id})d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where SATI_LIBRARY ='非常不符合' and main_id = #{id})e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id}) f
         union all
         select '网络资源' as lsname,format(round(a.fc_cnt/f.tot_cnt,2)*100,0) as tj1,format(round(b.bj_cnt/f.tot_cnt,2)*100,0) as tj2,format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where SATI_NET ='非常满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))a,
-        (select count('x') as bj_cnt from bl_teacher_answer where SATI_NET ='比较满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))b,
-        (select count('x') as yb_cnt from bl_teacher_answer where SATI_NET ='一般' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where SATI_NET ='比较不满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where SATI_NET ='非常不符合' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型')) f
+        (select count('x') as fc_cnt from bl_teacher_answer where SATI_NET ='非常满意' and main_id = #{id})a,
+        (select count('x') as bj_cnt from bl_teacher_answer where SATI_NET ='比较满意' and main_id = #{id})b,
+        (select count('x') as yb_cnt from bl_teacher_answer where SATI_NET ='一般' and main_id = #{id})c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where SATI_NET ='比较不满意' and main_id = #{id})d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where SATI_NET ='非常不符合' and main_id = #{id})e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id}) f
         union all
         select '体育文化等基础设施' as lsname,format(round(a.fc_cnt/f.tot_cnt,2)*100,0) as tj1,format(round(b.bj_cnt/f.tot_cnt,2)*100,0) as tj2,format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where SATI_SPORT ='非常满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))a,
-        (select count('x') as bj_cnt from bl_teacher_answer where SATI_SPORT ='比较满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))b,
-        (select count('x') as yb_cnt from bl_teacher_answer where SATI_SPORT ='一般' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where SATI_SPORT ='比较不满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where SATI_SPORT ='非常不符合' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型')) f
+        (select count('x') as fc_cnt from bl_teacher_answer where SATI_SPORT ='非常满意' and main_id = #{id})a,
+        (select count('x') as bj_cnt from bl_teacher_answer where SATI_SPORT ='比较满意' and main_id = #{id})b,
+        (select count('x') as yb_cnt from bl_teacher_answer where SATI_SPORT ='一般' and main_id = #{id})c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where SATI_SPORT ='比较不满意' and main_id = #{id})d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where SATI_SPORT ='非常不符合' and main_id = #{id})e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id}) f
         union all
         select '教室及教学设备' as lsname,format(round(a.fc_cnt/f.tot_cnt,2)*100,0) as tj1,format(round(b.bj_cnt/f.tot_cnt,2)*100,0) as tj2,format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where SATI_ROOM ='非常满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))a,
-        (select count('x') as bj_cnt from bl_teacher_answer where SATI_ROOM ='比较满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))b,
-        (select count('x') as yb_cnt from bl_teacher_answer where SATI_ROOM ='一般' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where SATI_ROOM ='比较不满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where SATI_ROOM ='非常不符合' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型')) f
+        (select count('x') as fc_cnt from bl_teacher_answer where SATI_ROOM ='非常满意' and main_id = #{id})a,
+        (select count('x') as bj_cnt from bl_teacher_answer where SATI_ROOM ='比较满意' and main_id = #{id})b,
+        (select count('x') as yb_cnt from bl_teacher_answer where SATI_ROOM ='一般' and main_id = #{id})c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where SATI_ROOM ='比较不满意' and main_id = #{id})d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where SATI_ROOM ='非常不符合' and main_id = #{id})e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id}) f
         union all
         select '实验室条件' as lsname,format(round(a.fc_cnt/f.tot_cnt,2)*100,0) as tj1,format(round(b.bj_cnt/f.tot_cnt,2)*100,0) as tj2,format(round(c.yb_cnt/f.tot_cnt,2)*100,0) as tj3,format(round(d.bjb_cnt/f.tot_cnt,2)*100,0) as tj4,format(round(e.fcb_cnt/f.tot_cnt,2)*100,0) as tj5 from
-        (select count('x') as fc_cnt from bl_teacher_answer where SATI_RESOURSE ='非常满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))a,
-        (select count('x') as bj_cnt from bl_teacher_answer where SATI_RESOURSE ='比较满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))b,
-        (select count('x') as yb_cnt from bl_teacher_answer where SATI_RESOURSE ='一般' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))c,
-        (select count('x') as bjb_cnt from bl_teacher_answer where SATI_RESOURSE ='比较不满意' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))d,
-        (select count('x') as fcb_cnt from bl_teacher_answer where SATI_RESOURSE ='非常不符合' and main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型'))e,
-        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id} and POSITIONTYPE not in ('辅导员','科研型')) f
+        (select count('x') as fc_cnt from bl_teacher_answer where SATI_RESOURSE ='非常满意' and main_id = #{id})a,
+        (select count('x') as bj_cnt from bl_teacher_answer where SATI_RESOURSE ='比较满意' and main_id = #{id})b,
+        (select count('x') as yb_cnt from bl_teacher_answer where SATI_RESOURSE ='一般' and main_id = #{id})c,
+        (select count('x') as bjb_cnt from bl_teacher_answer where SATI_RESOURSE ='比较不满意' and main_id = #{id})d,
+        (select count('x') as fcb_cnt from bl_teacher_answer where SATI_RESOURSE ='非常不符合' and main_id = #{id})e,
+        (select count('x') as tot_cnt from bl_teacher_answer where main_id = #{id}) f
         ) t order by tj1 asc
     </select>
 
@@ -1806,35 +1806,35 @@
     <select id="getSelectzytjpj3" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
         select '教室及教学设备' as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(round(sum(SATI_ROOM2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(round(sum(SATI_ROOM2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(round(sum(SATI_ROOM2)/count('x'),2),0)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(round(sum(SATI_ROOM2)/count('x'),2),0)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(round(sum(SATI_ROOM2)/count('x'),2),0)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '实验室条件'  as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(round(sum(SATI_RESOURSE2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(round(sum(SATI_RESOURSE2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(round(sum(SATI_RESOURSE2)/count('x'),2),0)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(round(sum(SATI_RESOURSE2)/count('x'),2),0)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(round(sum(SATI_RESOURSE2)/count('x'),2),0)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '图书馆资源'  as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(round(sum(SATI_LIBRARY2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(round(sum(SATI_LIBRARY2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(round(sum(SATI_LIBRARY2)/count('x'),2),0)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(round(sum(SATI_LIBRARY2)/count('x'),2),0)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(round(sum(SATI_LIBRARY2)/count('x'),2),0)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '网络资源'  as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(round(sum(SATI_NET2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(round(sum(SATI_NET2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(round(sum(SATI_NET2)/count('x'),2),0)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(round(sum(SATI_NET2)/count('x'),2),0)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(round(sum(SATI_NET2)/count('x'),2),0)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
         union all
         select '体育文化等基础设施'  as lsname,a.d1 as tj1,b.d2 as tj2,c.d3 as tj3,d.d4 as tj4
         from
-        (select format(round(sum(SATI_SPORT2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )a,
+        (select format(round(sum(SATI_SPORT2)/count('x'),2),0)as d1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id = #{id} )a,
         (select format(round(sum(SATI_SPORT2)/count('x'),2),0)as d2 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id = #{id} )b,
         (select format(round(sum(SATI_SPORT2)/count('x'),2),0)as d3 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id = #{id} )c,
         (select format(round(sum(SATI_SPORT2)/count('x'),2),0)as d4 from bl_teacher_answer where POSITIONTYPE = '辅导员' and main_id = #{id} )d
@@ -1913,7 +1913,7 @@
 
     <!--   不同岗位类型教师对学校整体的满意度 -->
     <select id="getSelectxxztmyd3" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
-        select '科研型' as lsname,format(sum(COLLSATI2)/count(*),0) as tj1 from bl_teacher_answer where POSITIONTYPE = '科研型' and main_id =#{id}
+        select '教学科研型' as lsname,format(sum(COLLSATI2)/count(*),0) as tj1 from bl_teacher_answer where POSITIONTYPE = '教学科研型' and main_id =#{id}
         union ALL
         select '教学型' as lsname,format(sum(COLLSATI2)/count(*),0) as tj1 from bl_teacher_answer where POSITIONTYPE = '教学型' and main_id =#{id}
         union ALL
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
index 5b650e6..10530ee 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
@@ -1162,7 +1162,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         //岗位类型结构
         List<BlTeacherAnswer> gwlxjgList = baseMapper.getSelectGwlxjg(blTeacherMain);
         for (BlTeacherAnswer par:gwlxjgList){
-            if(StringUtils.equals(par.getPositiontype(),"科研型")){
+            if(StringUtils.equals(par.getPositiontype(),"教学科研型")){
                 result.put("gwlxjg1", par.getCnt());//数量
                 result.put("gwlxjg1_zb", par.getNum());//占比
             }else if(StringUtils.equals(par.getPositiontype(),"教学型")){
@@ -1273,7 +1273,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         Integer num3 = 0;
         Integer num4 = 0;
         for(BlTeacherAnswer par:xxztmyd3List){
-            if(StringUtils.equals(par.getLsname(),"科研型")){
+            if(StringUtils.equals(par.getLsname(),"教学科研型")){
                 num1 = (int)Double.parseDouble(par.getTj1());
             }else if(StringUtils.equals(par.getLsname(),"教学型")){
                 num2 = (int)Double.parseDouble(par.getTj1());
@@ -1289,7 +1289,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "      ['对学校整体的满意度', "+num1+", "+num2+", "+num3+", "+num4+"], \n" +
                 "    ]},xAxis: { type: 'category' },yAxis: {}, \n" +
                 "  series: [\n" +
-                "    {name:'科研型',type: 'bar',barWidth:50, label: { show: true,   position: 'top',fontSize: 25 } }, \n" +
+                "    {name:'教学科研型',type: 'bar',barWidth:50, label: { show: true,   position: 'top',fontSize: 25 } }, \n" +
                 "    {name:'教学型',type: 'bar',barWidth:50, label: { show: true,   position: 'top',fontSize: 25 } },\n" +
                 "    {name:'科研型',type: 'bar',barWidth:50, label: { show: true,   position: 'top',fontSize: 25 } },\n" +
                 "    {name:'辅导员',type: 'bar',barWidth:50, label: { show: true,   position: 'top',fontSize: 25 } },\n" +
@@ -1813,13 +1813,13 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 " tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
                 "formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
                 "data: ['答疑课程内容、指导课程作业','指导学期、学年和毕业论文','讨论世界观、人生观、价值观等问题','指导学生从事研究项目和竞赛活动','关注学生的心理健康状况','指导学生职业生涯规划与就业创业'],inverse:true }, series: [ " +
-                "{  name: '科研型', type: 'bar',\n" +
+                "{  name: '正高级', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(sshdTjt31)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
-                "{ name: '教学型', type: 'bar',\n" +
+                "{ name: '副高级', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(sshdTjt32)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
-                "{ name: '科研型', type: 'bar',\n" +
+                "{ name: '中级', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(sshdTjt33)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
-                "{ name: '辅导员', type: 'bar',\n" +
+                "{ name: '初级', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(sshdTjt34)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
                 "] }";
         String sshdTjt32OptionsImg = WebDriverUtil.getImgByte500(sshdTjt32Options);
@@ -1840,7 +1840,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         for(int i=0;i<sshdTjt2List.size();i++){
             BlTeacherAnswer par = sshdTjt2List.get(i);
 //            sshdTjt2name[i] = par.getLsname();
-            if(StringUtils.equals(par.getLsname(),"科研型")){
+            if(StringUtils.equals(par.getLsname(),"教学科研型")){
                 sshdTjt21[0] = (int)Double.parseDouble(par.getTj1());
                 sshdTjt21[1] = (int)Double.parseDouble(par.getTj2());
                 sshdTjt21[2] = (int)Double.parseDouble(par.getTj3());
@@ -1882,7 +1882,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 " tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
                 "formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
                 "data: ['答疑课程内容、指导课程作业','指导学期、学年和毕业论文','关注学生的心里健康状况','讨论世界观、人生观、价值观等问题','指导学生从事研究项目和竞赛活动','指导学生职业生涯规划与就业创业',],inverse:true }, series: [ " +
-                "{  name: '科研型', type: 'bar',\n" +
+                "{  name: '教学科研型', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(sshdTjt21)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
                 "{ name: '教学型', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(sshdTjt22)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
@@ -1989,7 +1989,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         Integer cgdxTjt2Num1[] = new Integer[5];//
         for(int i=0;i<cgdxTjt2List.size();i++){
             BlTeacherAnswer par = cgdxTjt2List.get(i);
-            if(StringUtils.equals(par.getLsname(),"科研型")){
+            if(StringUtils.equals(par.getLsname(),"教学科研型")){
                 cgdxTjt2Num[0] = (int)Double.parseDouble(par.getTj1());
                 cgdxTjt2Num[1] = (int)Double.parseDouble(par.getTj2());
                 cgdxTjt2Num[2] = (int)Double.parseDouble(par.getTj3());
@@ -2008,7 +2008,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 " tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
                 "formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
                 "data: ['我会根据学生学习效果，及时反思总结，改进我的教学', '我明确任教课程对整体人才培养目标的关联与责任', '我很了解人才培养方案的主要内容', '我将“学生中心”理念全面落实在自己的各个教育教学工作中', '我会对应学生的毕业要求制定课程目标'],inverse:true }, series: [ {\n" +
-                "  name: '科研型', type: 'bar',\n" +
+                "  name: '教学科研型', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(cgdxTjt2Num)+" ,label:{show: true,position: 'outside', fontSize: 20},}, {\n" +
                 "  name: '教学型', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(cgdxTjt2Num1)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
@@ -2222,7 +2222,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 btgwlxjskcjxrrszys1[2] = (int)Double.parseDouble(par.getTj3());
                 btgwlxjskcjxrrszys1[3] = (int)Double.parseDouble(par.getTj4());
                 btgwlxjskcjxrrszys1[4] = (int)Double.parseDouble(par.getTj5());
-            }else if(StringUtils.equals(par.getLsname(),"科研型")){
+            }else if(StringUtils.equals(par.getLsname(),"教学科研型")){
                 btgwlxjskcjxrrszys2[0] = (int)Double.parseDouble(par.getTj1());
                 btgwlxjskcjxrrszys2[1] = (int)Double.parseDouble(par.getTj2());
                 btgwlxjskcjxrrszys2[2] = (int)Double.parseDouble(par.getTj3());
@@ -2235,7 +2235,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 " tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
                 "formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
                 "data: ['以讲授为主融入课程内容', '在学生参与讨论、展示等课堂互动环节中融入', '融入课堂作业、论文中', '融入实验、实训中', '并未涉及题目所述内容'],inverse:true }, series: [ {\n" +
-                "  name: '科研型', type: 'bar',\n" +
+                "  name: '教学科研型', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(btgwlxjskcjxrrszys2)+" ,label:{show: true,position: 'outside', fontSize: 20},}, {\n" +
                 "  name: '教学型', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(btgwlxjskcjxrrszys1)+" ,label:{show: true,position: 'outside', fontSize: 20},} ] }";
@@ -2351,7 +2351,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 btgwlxjszgxgzrdpjsjtr1[2] = (int)Double.parseDouble(par.getTj3());
                 btgwlxjszgxgzrdpjsjtr1[3] = (int)Double.parseDouble(par.getTj4());
                 btgwlxjszgxgzrdpjsjtr1[4] = (int)Double.parseDouble(par.getTj5());
-            }else if(StringUtils.equals(par.getLsname(),"科研型")){
+            }else if(StringUtils.equals(par.getLsname(),"教学科研型")){
                 btgwlxjszgxgzrdpjsjtr2[0] = (int)Double.parseDouble(par.getTj1());
                 btgwlxjszgxgzrdpjsjtr2[1] = (int)Double.parseDouble(par.getTj2());
                 btgwlxjszgxgzrdpjsjtr2[2] = (int)Double.parseDouble(par.getTj3());
@@ -2364,7 +2364,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 " tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
                 "formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
                 "data: ['低年级本科专业必修课', '专业选修课', '研究生课程', '高年级本科专业必修课', '公共通识课程'],inverse:true }, series: [ {\n" +
-                "  name: '科研型', type: 'bar',\n" +
+                "  name: '教学科研型', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(btgwlxjszgxgzrdpjsjtr2)+" ,label:{show: true,position: 'outside', fontSize: 20},}, {\n" +
                 "  name: '教学型', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(btgwlxjszgxgzrdpjsjtr1)+" ,label:{show: true,position: 'outside', fontSize: 20},} ] }";
@@ -2469,7 +2469,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         Integer btgwlxpjsjTj2[] = new Integer[6];//
         for(int i=0;i<btgwlxpjsjTjtList.size();i++){
             BlTeacherAnswer par = btgwlxpjsjTjtList.get(i);
-            if(StringUtils.equals(par.getLsname(),"科研型")){
+            if(StringUtils.equals(par.getLsname(),"教学科研型")){
                 btgwlxpjsjTj1[0] = (int)Double.parseDouble(par.getTj1());
                 btgwlxpjsjTj1[1] = (int)Double.parseDouble(par.getTj2());
                 btgwlxpjsjTj1[2] = (int)Double.parseDouble(par.getTj3());
@@ -2490,7 +2490,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 " tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
                 "formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
                 "data: ['科研工作', '教学准备（包括批阅学生作业和评分）', '教学任务', '给学生答疑和辅导', '院系／部门工作和会议及其他行政工作', '兼职及其他社会服务工作'],inverse:true }, series: [ {\n" +
-                "  name: '科研型', type: 'bar',\n" +
+                "  name: '教学科研型', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(btgwlxpjsjTj1)+" ,label:{show: true,position: 'outside', fontSize: 20},}, {\n" +
                 "  name: '教学型', type: 'bar',\n" +
                 "  data: "+JSONObject.toJSONString(btgwlxpjsjTj2)+" ,label:{show: true,position: 'outside', fontSize: 20},} ] }";
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherInfo/entity/BlTeacherInfo.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherInfo/entity/BlTeacherInfo.java
index fa1423a..1725e57 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherInfo/entity/BlTeacherInfo.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherInfo/entity/BlTeacherInfo.java
@@ -1,22 +1,18 @@
 package org.jeecg.modules.demo.blTeacherInfo.entity;
 
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: 教师调研报告