From 241fa1525ae445d8dd934fb24782405c0b9b41f7 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Fri, 12 Jul 2024 23:29:22 +0800 Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B47=E6=9C=8812=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 --- .../blStuAnswer/mapper/BlStuAnswerMapper.java | 86 +++++++ .../mapper/xml/BlStuAnswerMapper.xml | 34 +-- .../service/impl/BlStuAnswerServiceImpl.java | 222 ++++++++++++------ .../officetemplates/exp1/student-tjfx.docx | Bin 302131 -> 303672 bytes 4 files changed, 253 insertions(+), 89 deletions(-) diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/BlStuAnswerMapper.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/BlStuAnswerMapper.java index 0e8606d..e31e53a 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/BlStuAnswerMapper.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/BlStuAnswerMapper.java @@ -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 { //答题数量 String selectDtsl(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_1_1(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_1_2(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_1_3(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> viewBlMajorStatic(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i1_1(String id); @@ -41,12 +47,15 @@ public interface BlStuAnswerMapper extends BaseMapper { String b1_1_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i1_2(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_3(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_4(String id); @@ -58,9 +67,11 @@ public interface BlStuAnswerMapper extends BaseMapper { String b1_2_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_5(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_6(String id); @@ -72,9 +83,11 @@ public interface BlStuAnswerMapper extends BaseMapper { String b1_2_8(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_7(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_8(String id); @@ -86,12 +99,15 @@ public interface BlStuAnswerMapper extends BaseMapper { String b1_3_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i1_9(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_10(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_11(String id); @@ -99,12 +115,15 @@ public interface BlStuAnswerMapper extends BaseMapper { String b1_4_2(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i1_12(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i1_13(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t1_14(String id); @@ -116,20 +135,25 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_1_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_1(String id); String b2_1_5(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_2(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_3(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_5(String id); @@ -141,12 +165,15 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_1_9(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_6(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_7(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_8(String id); @@ -162,15 +189,19 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_2_6(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_9(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_10(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_11(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_12(String id); @@ -182,12 +213,15 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_3_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_13(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_14(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_15(String id); @@ -203,9 +237,11 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_4_6(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_16(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_17(String id); @@ -215,12 +251,15 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_5_3(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_18(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_19(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_20(String id); @@ -234,9 +273,11 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_6_5(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_21(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_22(String id); @@ -250,15 +291,19 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_6_10(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_23(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_24(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_25(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_26(String id); @@ -270,12 +315,15 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_7_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_27(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_28(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_29(String id); @@ -289,15 +337,19 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_8_5(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_30(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_31(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_32(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_33(String id); @@ -315,15 +367,19 @@ public interface BlStuAnswerMapper extends BaseMapper { String b2_9_7(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i2_34(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_35(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t2_36(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i3_1(String id); @@ -335,12 +391,15 @@ public interface BlStuAnswerMapper extends BaseMapper { String b3_1_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i3_2(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t3_3(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t3_4(String id); @@ -352,20 +411,25 @@ public interface BlStuAnswerMapper extends BaseMapper { String b3_2_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i3_5(String id); String b3_2_5(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i3_6(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t3_7(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t3_8(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i3_9(String id); @@ -379,15 +443,19 @@ public interface BlStuAnswerMapper extends BaseMapper { String b3_3_5(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i3_10(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t3_11(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t3_12(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i4_1(String id); @@ -399,12 +467,15 @@ public interface BlStuAnswerMapper extends BaseMapper { String b4_1_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i4_2(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t4_3(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t4_4(String id); @@ -420,15 +491,19 @@ public interface BlStuAnswerMapper extends BaseMapper { String b4_2_6(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i4_5(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t4_6(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t4_7(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i4_8(String id); @@ -442,15 +517,19 @@ public interface BlStuAnswerMapper extends BaseMapper { String b4_3_5(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i4_9(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t4_10(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t4_11(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i4_12(String id); @@ -466,12 +545,15 @@ public interface BlStuAnswerMapper extends BaseMapper { String b4_4_6(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i4_13(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t4_14(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t4_15(String id); @@ -483,17 +565,21 @@ public interface BlStuAnswerMapper extends BaseMapper { String b5_1_4(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i5_1(String id); String b5_1_5(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> i5_2(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t5_3(String id); + @InterceptorIgnore(tenantLine = "true") @MapKey("key") List> t5_4(String id); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/xml/BlStuAnswerMapper.xml b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/mapper/xml/BlStuAnswerMapper.xml index edd56da..52ebe5d 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 @@ -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