2024年7月12日 修复问题
This commit is contained in:
parent
6b4cae0232
commit
241fa1525a
|
|
@ -1,5 +1,6 @@
|
|||
package org.jeecg.modules.demo.blStuAnswer.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.MapKey;
|
||||
import org.jeecg.modules.demo.blStuAnswer.entity.BlStuAnswer;
|
||||
|
|
@ -18,18 +19,23 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
//答题数量
|
||||
String selectDtsl(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_1_1(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_1_2(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_1_3(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> viewBlMajorStatic(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i1_1(String id);
|
||||
|
||||
|
|
@ -41,12 +47,15 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b1_1_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i1_2(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_3(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_4(String id);
|
||||
|
||||
|
|
@ -58,9 +67,11 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b1_2_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_5(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_6(String id);
|
||||
|
||||
|
|
@ -72,9 +83,11 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b1_2_8(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_7(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_8(String id);
|
||||
|
||||
|
|
@ -86,12 +99,15 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b1_3_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i1_9(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_10(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_11(String id);
|
||||
|
||||
|
|
@ -99,12 +115,15 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b1_4_2(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i1_12(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i1_13(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_14(String id);
|
||||
|
||||
|
|
@ -116,20 +135,25 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_1_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_1(String id);
|
||||
|
||||
String b2_1_5(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_2(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_3(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_5(String id);
|
||||
|
||||
|
|
@ -141,12 +165,15 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_1_9(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_6(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_7(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_8(String id);
|
||||
|
||||
|
|
@ -162,15 +189,19 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_2_6(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_9(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_10(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_11(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_12(String id);
|
||||
|
||||
|
|
@ -182,12 +213,15 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_3_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_13(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_14(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_15(String id);
|
||||
|
||||
|
|
@ -203,9 +237,11 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_4_6(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_16(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_17(String id);
|
||||
|
||||
|
|
@ -215,12 +251,15 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_5_3(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_18(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_19(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_20(String id);
|
||||
|
||||
|
|
@ -234,9 +273,11 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_6_5(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_21(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_22(String id);
|
||||
|
||||
|
|
@ -250,15 +291,19 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_6_10(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_23(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_24(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_25(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_26(String id);
|
||||
|
||||
|
|
@ -270,12 +315,15 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_7_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_27(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_28(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_29(String id);
|
||||
|
||||
|
|
@ -289,15 +337,19 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_8_5(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_30(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_31(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_32(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_33(String id);
|
||||
|
||||
|
|
@ -315,15 +367,19 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b2_9_7(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_34(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_35(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_36(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i3_1(String id);
|
||||
|
||||
|
|
@ -335,12 +391,15 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b3_1_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i3_2(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_3(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_4(String id);
|
||||
|
||||
|
|
@ -352,20 +411,25 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b3_2_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i3_5(String id);
|
||||
|
||||
String b3_2_5(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i3_6(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_7(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_8(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i3_9(String id);
|
||||
|
||||
|
|
@ -379,15 +443,19 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b3_3_5(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i3_10(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_11(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_12(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i4_1(String id);
|
||||
|
||||
|
|
@ -399,12 +467,15 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b4_1_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i4_2(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_3(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_4(String id);
|
||||
|
||||
|
|
@ -420,15 +491,19 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b4_2_6(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i4_5(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_6(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_7(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i4_8(String id);
|
||||
|
||||
|
|
@ -442,15 +517,19 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b4_3_5(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i4_9(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_10(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_11(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i4_12(String id);
|
||||
|
||||
|
|
@ -466,12 +545,15 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b4_4_6(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i4_13(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_14(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_15(String id);
|
||||
|
||||
|
|
@ -483,17 +565,21 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
String b5_1_4(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i5_1(String id);
|
||||
|
||||
String b5_1_5(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i5_2(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t5_3(String id);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t5_4(String id);
|
||||
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@
|
|||
round(sum(IN_CLASS_QUESTIONS2)/count('x'),2) as '02',
|
||||
round(sum(AFTER_CLASS_SUMMARY2)/count('x'),2) as '03',
|
||||
round(sum(AFTER_CLASS_READ2)/count('x'),2) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="b1_2_1" resultType="String">
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
round(sum(STUDYTIME_SELF)/count('x')) as '02',
|
||||
round(sum(STUDYTIME_READ)/count('x')) as '03',
|
||||
round(sum(STUDYTIME_ONLINE)/count('x')) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="b1_2_5" resultType="String">
|
||||
|
|
@ -282,7 +282,7 @@
|
|||
round(sum(STUDYTIME_SOCIETY)/count('x')) as '02',
|
||||
round(sum(STUDYTIME_COMPETITION)/count('x')) as '03',
|
||||
round(sum(STUDYTIME_OTHER)/count('x')) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="b1_3_1" resultType="String">
|
||||
|
|
@ -384,7 +384,7 @@
|
|||
round(round(sum(INTERACT_RESEARCH1)/count('x'),2)*100) as '02',
|
||||
round(round(sum(INTERACT_COMPETITION1)/count('x'),2)*100) as '03',
|
||||
round(round(sum(INTERACT_RESEARCH1)/count('x'),2)*100) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="b1_4_1" resultType="String">
|
||||
|
|
@ -796,7 +796,7 @@
|
|||
round(sum(ZYK_ADVANCED2)/count('x'),2) as '04',
|
||||
round(sum(ZYK_INTERN2)/count('x'),2) as '05',
|
||||
round(sum(ZYK_EFFORT2)/count('x'),2) as '06'
|
||||
from bl_stu_answer GROUP BY major order by major;
|
||||
from bl_stu_answer GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci;
|
||||
</select>
|
||||
|
||||
<select id="i2_12" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -916,7 +916,7 @@
|
|||
round(sum(METHOD_HUDONG2)/count('x'),2) as '02',
|
||||
round(sum(METHOD_ANLI2)/count('x'),2) as '03',
|
||||
round(sum(METHOD_XIANGMU2)/count('x'),2) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="b2_4_1" resultType="String">
|
||||
|
|
@ -1054,7 +1054,7 @@
|
|||
round(sum(EDUSATI_TI2)/count('x')) as '01',
|
||||
round(sum(EDUSATI_MEI2)/count('x')) as '02',
|
||||
round(sum(EDUSATI_LAO2)/count('x')) as '03'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="b2_6_1" resultType="String">
|
||||
|
|
@ -1312,7 +1312,7 @@
|
|||
round(sum(INTERN_TIME_SATIS2)/count('x')) as '02',
|
||||
round(sum(INTERN_GUIDE_SATIS2)/count('x')) as '03',
|
||||
round(sum(INTERN_EQUIP_SATIS2)/count('x')) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="i2_29" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -1458,7 +1458,7 @@
|
|||
round(sum(ABILITY_COOPERATE2)/count('x'),2) as '03',
|
||||
round(sum(ABILITY_COMMUNICATE2)/count('x'),2) as '04',
|
||||
round(sum(ABILITY_PLAN2)/count('x'),2) as '05'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="i2_33" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -1655,7 +1655,7 @@
|
|||
round(sum(SUYANG_ZEREN2)/count('x')) as '05',
|
||||
round(sum(SUYANG_SHIJIAN2)/count('x')) as '06',
|
||||
round(sum(SUYANG_TISHENG2)/count('x')) as '07'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="i3_1" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -1774,7 +1774,7 @@
|
|||
round(sum(TEACHERSATI_INPUT2)/count('x')) as '02',
|
||||
round(sum(TEACHERSATI_LAW2)/count('x')) as '03',
|
||||
round(sum(TEACHERSATI_CARE2)/count('x')) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="b3_2_1" resultType="String">
|
||||
|
|
@ -1973,7 +1973,7 @@
|
|||
round(sum(TEACHER_METHOD2)/count('x'),2) as '03',
|
||||
round(sum(TEACHER_INTEREST2)/count('x'),2) as '04',
|
||||
round(sum(TEACHER_AFTER2)/count('x'),2) as '05'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="i4_1" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -2088,7 +2088,7 @@
|
|||
round(sum(STUDENTCENTER_EXPERIMENT2)/count('x'),2) as '02',
|
||||
round(sum(STUDENTCENTER_ACTIVITY2)/count('x'),2) as '03',
|
||||
round(sum(STUDENTCENTER_LECTURE2)/count('x'),2) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="b4_2_1" resultType="String">
|
||||
|
|
@ -2112,7 +2112,7 @@
|
|||
</select>
|
||||
|
||||
<select id="b4_2_6" resultType="String">
|
||||
select concat(round(round(b.no_cnt/a.tot_cnt,2)*100)) from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_NO = #{id})b
|
||||
select concat(round(round(b.no_cnt/a.tot_cnt,2)*100)) from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_NO = '1')b
|
||||
</select>
|
||||
|
||||
<select id="i4_5" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -2175,7 +2175,7 @@
|
|||
round(round(sum(XYZD_DAOSHI)/count('x'),2)*100) as '04',
|
||||
round(round(sum(XYZD_FDY)/count('x'),2)*100) as '05',
|
||||
round(round(sum(XYZD_NO)/count('x'),2)*100) as '06'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="i4_8" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -2315,7 +2315,7 @@
|
|||
round(sum(STUSATI_FDY2)/count('x')) as '03',
|
||||
round(sum(STUSATI_XYZD2)/count('x')) as '04',
|
||||
round(sum(STUSATI_ZZ2)/count('x')) as '05'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="i4_12" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -2480,7 +2480,7 @@
|
|||
round(sum(CAMPUS_INTERNET2)/count('x')) as '04',
|
||||
round(sum(CAMPUS_SPORT2)/count('x')) as '05',
|
||||
round(sum(CAMPUS_RESIDENCE2)/count('x')) as '06'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by major
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
</select>
|
||||
|
||||
<select id="b5_1_1" resultType="String">
|
||||
|
|
|
|||
|
|
@ -566,9 +566,25 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
* @param o
|
||||
* @return
|
||||
*/
|
||||
public String getMapStr(Object o) {
|
||||
public String getMapStrTo00(Object o) {
|
||||
return getMapStr(o, false, "0.00");
|
||||
}
|
||||
|
||||
// return NumberUtil.decimalFormat("0.00", o);
|
||||
/**
|
||||
* 将数据转换成Sting
|
||||
* @param o
|
||||
* @return
|
||||
*/
|
||||
public String getMapStr(Object o) {
|
||||
return getMapStr(o, true, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 将数据转换成Sting
|
||||
* @param o
|
||||
* @return
|
||||
*/
|
||||
public String getMapStr(Object o, boolean autoDecimalFormat, String decimalFormat) {
|
||||
try {
|
||||
var rData = "";
|
||||
if (o instanceof String r){
|
||||
|
|
@ -585,13 +601,18 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
rData = String.valueOf(f);
|
||||
}
|
||||
|
||||
//想办法去除.00
|
||||
if(NumberUtil.isNumber(rData)) {
|
||||
rData = NumberUtil.decimalFormat("0.00", new BigDecimal(rData), RoundingMode.HALF_UP);
|
||||
if(StringUtils.contains(rData, ".00")) {
|
||||
rData = NumberUtil.decimalFormat("#", new BigDecimal(rData), RoundingMode.HALF_UP);
|
||||
if(autoDecimalFormat){
|
||||
//想办法去除.00
|
||||
if(NumberUtil.isNumber(rData)) {
|
||||
rData = NumberUtil.decimalFormat("0.00", new BigDecimal(rData), RoundingMode.HALF_UP);
|
||||
if(StringUtils.contains(rData, ".00")) {
|
||||
rData = NumberUtil.decimalFormat("#", new BigDecimal(rData), RoundingMode.HALF_UP);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
rData = NumberUtil.decimalFormat(decimalFormat, new BigDecimal(rData), RoundingMode.HALF_UP);
|
||||
}
|
||||
|
||||
return rData;
|
||||
}catch (Exception e) {
|
||||
log.error(e.getMessage(),e);
|
||||
|
|
@ -614,6 +635,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
//标准最简单柱状图
|
||||
var json = """
|
||||
{
|
||||
grid: { left: '12%%', right: '3%%', bottom: '0%%', containLabel: true },
|
||||
xAxis: { type: 'category',
|
||||
data: %s
|
||||
},
|
||||
|
|
@ -627,6 +649,56 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
return WebDriverUtil.getImgByte400(json);
|
||||
}
|
||||
|
||||
/**
|
||||
* 标准最简单横向柱状图
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
public String getBaseTransverseHistogram(List<Map<String, String>> list){
|
||||
return getBaseTransverseHistogram(list, 100);
|
||||
}
|
||||
|
||||
/**
|
||||
* 标准最简单横向柱状图
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
public String getBaseTransverseHistogram(List<Map<String, String>> list, Integer max){
|
||||
List<String> yAxisData = Lists.newArrayList();
|
||||
List<String> seriesData = Lists.newArrayList();
|
||||
list.forEach(x -> {
|
||||
yAxisData.add(x.get(KEY));
|
||||
seriesData.add(getMapStr(x.get(K01)));
|
||||
});
|
||||
//标准最简单横向柱状图
|
||||
var json = """
|
||||
{
|
||||
title: { right: '30', text: '（%%）', textStyle: { fontSize: 30 } },
|
||||
grid: { left: '12%%', right: '3%%', bottom: '0%%', containLabel: true },
|
||||
xAxis: {
|
||||
type: 'value', position: 'top', max: %s,
|
||||
axisLabel: { textStyle: { color: '#000', fontSize: 20 }, },
|
||||
axisLine: { show: true, },
|
||||
axisTick: { show: true, inside: true, }
|
||||
},
|
||||
yAxis: {
|
||||
type: 'category',
|
||||
axisLabel: { textStyle: { color: '#000', fontSize: 20 }, },
|
||||
axisTick: { show: true, inside: true, },
|
||||
data: %s,
|
||||
},
|
||||
series: [
|
||||
{
|
||||
data: %s,
|
||||
type: 'bar'
|
||||
}
|
||||
]
|
||||
}
|
||||
""";
|
||||
json = json.formatted(max, JSONUtil.toJsonStr(yAxisData), JSONUtil.toJsonStr(seriesData));
|
||||
return WebDriverUtil.getImgByte400(json);
|
||||
}
|
||||
|
||||
public int getNotZeroData(List<String> dataList, int i) {
|
||||
var data = dataList.get(i);
|
||||
if(Integer.parseInt(data) == 0){
|
||||
|
|
@ -642,7 +714,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
* @return
|
||||
*/
|
||||
public String getStackHistogram(List<Map<String, String>> list) {
|
||||
return getStackHistogram(list, true, null);
|
||||
return getStackHistogram(list, true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -651,7 +723,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
* @return
|
||||
*/
|
||||
public String getStackHistogram(List<Map<String, String>> list, boolean isAutoCompletionPercentage) {
|
||||
return getStackHistogram(list, isAutoCompletionPercentage, null);
|
||||
return getStackHistogram(list, isAutoCompletionPercentage, null, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -659,8 +731,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
* @param list
|
||||
* @return
|
||||
*/
|
||||
public String getStackHistogram(List<Map<String, String>> list, boolean isAutoCompletionPercentage, String height) {
|
||||
public String getStackHistogram(List<Map<String, String>> list, boolean isAutoCompletionPercentage, String height, String laberWidth, String textNextRowNum) {
|
||||
var colorList = List.of("#0f447f","#2350a0", "#008ac8", "#57b8e7", "#beedf8");
|
||||
if(laberWidth == null) {
|
||||
laberWidth = "12";
|
||||
}
|
||||
if(textNextRowNum == null) {
|
||||
textNextRowNum = "12";
|
||||
}
|
||||
AtomicInteger i = new AtomicInteger(0);
|
||||
Function<AtomicInteger, String> getColor = _i -> {
|
||||
if(colorList.size() - 1 < _i.get()) {
|
||||
|
|
@ -748,14 +826,14 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
title: { right: '30', text: '（%%）', textStyle: { fontSize: 30 } },
|
||||
tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
|
||||
legend: {},
|
||||
grid: { left: '12%%', right: '1%%', bottom: '0%%', containLabel: true },
|
||||
grid: { left: '%s%%', right: '3%%', bottom: '0%%', containLabel: true },
|
||||
xAxis: { type: 'value' },
|
||||
yAxis: { type: 'category', inverse: true,
|
||||
data: %s,
|
||||
axisLabel: {
|
||||
formatter: (v) => {
|
||||
let l = String(v).split('');let r = '';
|
||||
l.forEach((x,i) => { if((i+1) %% 12 == 0){ r += x + '\\n'; } else { r += x; } });
|
||||
l.forEach((x,i) => { if((i+1) %% %s == 0){ r += x + '\\n'; } else { r += x; } });
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
|
@ -772,7 +850,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
seriesListSb.append("[");
|
||||
seriesList.forEach(seriesListSb::append);
|
||||
seriesListSb.append("]");
|
||||
json = json.formatted(yAxisDataSb.toString(), seriesListSb.toString());
|
||||
json = json.formatted(laberWidth, yAxisDataSb.toString(), textNextRowNum, seriesListSb.toString());
|
||||
if(height == null) {
|
||||
height = "400";
|
||||
}
|
||||
|
|
@ -992,7 +1070,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
//图片1_1
|
||||
public void i1_1(WordOperator wo, Map<String, Object> result, String id) {
|
||||
var list = baseMapper.i1_1(id);
|
||||
String imagePath = getStackHistogram(list);
|
||||
String imagePath = getStackHistogram(list, true, null, "30", "20");
|
||||
result.put("i1_1", imagePath);
|
||||
log.info(imagePath);
|
||||
}
|
||||
|
|
@ -1022,10 +1100,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
});
|
||||
wo.insert2Table(1,1,true,table);
|
||||
}
|
||||
|
|
@ -1039,10 +1117,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
});
|
||||
wo.insert2Table(2,1,true,table);
|
||||
}
|
||||
|
|
@ -1346,11 +1424,11 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStr(x.get(K05)));
|
||||
col.add(x.get(K01));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K05)));
|
||||
});
|
||||
wo.insert2Table(13,1,true,table);
|
||||
}
|
||||
|
|
@ -1363,12 +1441,12 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStr(x.get(K05)));
|
||||
col.add(getMapStr(x.get(K06)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K05)));
|
||||
col.add(getMapStrTo00(x.get(K06)));
|
||||
});
|
||||
wo.insert2Table(14,2,true,table);
|
||||
}
|
||||
|
|
@ -1404,10 +1482,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
});
|
||||
wo.insert2Table(15,1,true,table);
|
||||
}
|
||||
|
|
@ -1421,10 +1499,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
});
|
||||
wo.insert2Table(16,1,true,table);
|
||||
}
|
||||
|
|
@ -1442,7 +1520,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
//图片i2_16
|
||||
public void i2_16(WordOperator wo, Map<String, Object> result, String id) {
|
||||
var list = baseMapper.i2_16(id);
|
||||
var imagePath = getStackHistogram(list, false);
|
||||
var imagePath = getBaseTransverseHistogram(list);
|
||||
result.put("i2_16", imagePath);
|
||||
}
|
||||
|
||||
|
|
@ -1510,7 +1588,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
//图片i2_21
|
||||
public void i2_21(WordOperator wo, Map<String, Object> result, String id) {
|
||||
var list = baseMapper.i2_21(id);
|
||||
var imagePath = getStackHistogram(list, false);
|
||||
var imagePath = getBaseTransverseHistogram(list);
|
||||
result.put("i2_21", imagePath);
|
||||
}
|
||||
|
||||
|
|
@ -1642,10 +1720,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
});
|
||||
wo.insert2Table(22,1,true,table);
|
||||
}
|
||||
|
|
@ -1658,18 +1736,18 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStr(x.get(K05)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K05)));
|
||||
});
|
||||
wo.insert2Table(23,1,true,table);
|
||||
}
|
||||
//图片i2_33
|
||||
public void i2_33(WordOperator wo, Map<String, Object> result, String id) {
|
||||
var list = baseMapper.i2_33(id);
|
||||
var imagePath = getStackHistogram(list, true, "500");
|
||||
var imagePath = getStackHistogram(list, true, "500", null, null);
|
||||
result.put("i2_33", imagePath);
|
||||
}
|
||||
//b2_9_1~7
|
||||
|
|
@ -1863,10 +1941,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
});
|
||||
wo.insert2Table(30,1,true,table);
|
||||
}
|
||||
|
|
@ -1879,11 +1957,11 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStr(x.get(K05)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K05)));
|
||||
});
|
||||
wo.insert2Table(31,1,true,table);
|
||||
}
|
||||
|
|
@ -1918,10 +1996,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
});
|
||||
wo.insert2Table(32,1,true,table);
|
||||
}
|
||||
|
|
@ -1934,10 +2012,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
List<String> col = Lists.newArrayList();
|
||||
table.add(col);
|
||||
col.add(x.get(KEY));
|
||||
col.add(getMapStr(x.get(K01)));
|
||||
col.add(getMapStr(x.get(K02)));
|
||||
col.add(getMapStr(x.get(K03)));
|
||||
col.add(getMapStr(x.get(K04)));
|
||||
col.add(getMapStrTo00(x.get(K01)));
|
||||
col.add(getMapStrTo00(x.get(K02)));
|
||||
col.add(getMapStrTo00(x.get(K03)));
|
||||
col.add(getMapStrTo00(x.get(K04)));
|
||||
});
|
||||
wo.insert2Table(33,1,true,table);
|
||||
}
|
||||
|
|
@ -1953,7 +2031,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
//图片i4_5
|
||||
public void i4_5(WordOperator wo, Map<String, Object> result, String id) {
|
||||
var list = baseMapper.i4_5(id);
|
||||
var imagePath = getStackHistogram(list, false);
|
||||
var imagePath = getBaseTransverseHistogram(list);
|
||||
result.put("i4_5", imagePath);
|
||||
}
|
||||
|
||||
|
|
@ -2147,7 +2225,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
radius: ['60%%', '95%%'],
|
||||
label: {
|
||||
show: true,
|
||||
fontSize: '50',
|
||||
fontSize: '30',
|
||||
//fontWeight: 'bold',
|
||||
//textStyle: {fontSize: 50}
|
||||
position: 'center',
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
普通高等学校本科教育教学审核评估（2021_2025年）
|
||||
普通高等学校本科教育教学审核评估（2021-2025年）
|
||||
在校生学习体验调查报告
|
||||
|
||||
{schoolName}
|
||||
|
|
|
|||
Loading…
Reference in New Issue