diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java index 4bfeb93..f3b35d9 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/controller/BlStuAnswerController.java @@ -226,7 +226,7 @@ public class BlStuAnswerController extends JeecgController createWord(@RequestParam(name="id",required=true) String id) throws Exception { + public Result createWord(@RequestParam(name="id",required=true) String id, @RequestParam(name="isDelChildren", defaultValue = "true") boolean isDelChildren) throws Exception { //直接导出附件 WordOperator wo = service.createWordTjfx(id); BlStuInfo blStuInfo = blStuInfoService.getById(id); @@ -238,6 +238,14 @@ public class BlStuAnswerController extends JeecgController { @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_1_1(String id); + List> t1_1_1(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_1_2(String id); + List> t1_1_2(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_1_3(String id); + List> t1_1_3(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> viewBlMajorStatic(String id); + List> viewBlMajorStatic(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> viewBlMajorStatic2(String id); + List> viewBlMajorStatic2(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i1_1(String id); + List> i1_1(BlStuInfo blStuMain); - String b1_1_1(String id); + String b1_1_1(BlStuInfo blStuMain); - String b1_1_2(String id); + String b1_1_2(BlStuInfo blStuMain); - String b1_1_3(String id); + String b1_1_3(BlStuInfo blStuMain); - String b1_1_4(String id); + String b1_1_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i1_2(String id); + List> i1_2(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_3(String id); + List> t1_3(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_4(String id); + List> t1_4(BlStuInfo blStuMain); - String b1_2_1(String id); + String b1_2_1(BlStuInfo blStuMain); - String b1_2_2(String id); + String b1_2_2(BlStuInfo blStuMain); - String b1_2_3(String id); + String b1_2_3(BlStuInfo blStuMain); - String b1_2_4(String id); + String b1_2_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_5(String id); + List> t1_5(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_6(String id); + List> t1_6(BlStuInfo blStuMain); - String b1_2_5(String id); + String b1_2_5(BlStuInfo blStuMain); - String b1_2_6(String id); + String b1_2_6(BlStuInfo blStuMain); - String b1_2_7(String id); + String b1_2_7(BlStuInfo blStuMain); - String b1_2_8(String id); + String b1_2_8(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_7(String id); + List> t1_7(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_8(String id); + List> t1_8(BlStuInfo blStuMain); - String b1_3_1(String id); + String b1_3_1(BlStuInfo blStuMain); - String b1_3_2(String id); + String b1_3_2(BlStuInfo blStuMain); - String b1_3_3(String id); + String b1_3_3(BlStuInfo blStuMain); - String b1_3_4(String id); + String b1_3_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i1_9(String id); + List> i1_9(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_10(String id); + List> t1_10(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_11(String id); + List> t1_11(BlStuInfo blStuMain); - String b1_4_1(String id); + String b1_4_1(BlStuInfo blStuMain); - String b1_4_2(String id); + String b1_4_2(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i1_12(String id); + List> i1_12(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i1_13(String id); + List> i1_13(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t1_14(String id); + List> t1_14(BlStuInfo blStuMain); - String b2_1_1(String id); + String b2_1_1(BlStuInfo blStuMain); - String b2_1_2(String id); + String b2_1_2(BlStuInfo blStuMain); - String b2_1_3(String id); + String b2_1_3(BlStuInfo blStuMain); - String b2_1_4(String id); + String b2_1_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_1(String id); + List> i2_1(BlStuInfo blStuMain); - String b2_1_5(String id); + String b2_1_5(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_2(String id); + List> i2_2(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_3(String id); + List> t2_3(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_4(String id); + List> t2_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_5(String id); + List> i2_5(BlStuInfo blStuMain); - String b2_1_6(String id); + String b2_1_6(BlStuInfo blStuMain); - String b2_1_7(String id); + String b2_1_7(BlStuInfo blStuMain); - String b2_1_8(String id); + String b2_1_8(BlStuInfo blStuMain); - String b2_1_9(String id); + String b2_1_9(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_6(String id); + List> i2_6(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_7(String id); + List> t2_7(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_8(String id); + List> i2_8(BlStuInfo blStuMain); - String b2_2_1(String id); + String b2_2_1(BlStuInfo blStuMain); - String b2_2_2(String id); + String b2_2_2(BlStuInfo blStuMain); - String b2_2_3(String id); + String b2_2_3(BlStuInfo blStuMain); - String b2_2_4(String id); + String b2_2_4(BlStuInfo blStuMain); - String b2_2_5(String id); + String b2_2_5(BlStuInfo blStuMain); - String b2_2_6(String id); + String b2_2_6(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_9(String id); + List> i2_9(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_10(String id); + List> t2_10(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_11(String id); + List> t2_11(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_12(String id); + List> i2_12(BlStuInfo blStuMain); - String b2_3_1(String id); + String b2_3_1(BlStuInfo blStuMain); - String b2_3_2(String id); + String b2_3_2(BlStuInfo blStuMain); - String b2_3_3(String id); + String b2_3_3(BlStuInfo blStuMain); - String b2_3_4(String id); + String b2_3_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_13(String id); + List> i2_13(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_14(String id); + List> t2_14(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_15(String id); + List> t2_15(BlStuInfo blStuMain); - String b2_4_1(String id); + String b2_4_1(BlStuInfo blStuMain); - String b2_4_2(String id); + String b2_4_2(BlStuInfo blStuMain); - String b2_4_3(String id); + String b2_4_3(BlStuInfo blStuMain); - String b2_4_4(String id); + String b2_4_4(BlStuInfo blStuMain); - String b2_4_5(String id); + String b2_4_5(BlStuInfo blStuMain); - String b2_4_6(String id); + String b2_4_6(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_16(String id); + List> i2_16(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_17(String id); + List> i2_17(BlStuInfo blStuMain); - String b2_5_1(String id); + String b2_5_1(BlStuInfo blStuMain); - String b2_5_2(String id); + String b2_5_2(BlStuInfo blStuMain); - String b2_5_3(String id); + String b2_5_3(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_18(String id); + List> i2_18(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_19(String id); + List> t2_19(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_20(String id); + List> t2_20(BlStuInfo blStuMain); - String b2_6_1(String id); + String b2_6_1(BlStuInfo blStuMain); - String b2_6_2(String id); + String b2_6_2(BlStuInfo blStuMain); - String b2_6_3(String id); + String b2_6_3(BlStuInfo blStuMain); - String b2_6_4(String id); + String b2_6_4(BlStuInfo blStuMain); - String b2_6_5(String id); + String b2_6_5(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_21(String id); + List> i2_21(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_22(String id); + List> i2_22(BlStuInfo blStuMain); - String b2_6_6(String id); + String b2_6_6(BlStuInfo blStuMain); - String b2_6_7(String id); + String b2_6_7(BlStuInfo blStuMain); - String b2_6_8(String id); + String b2_6_8(BlStuInfo blStuMain); - String b2_6_9(String id); + String b2_6_9(BlStuInfo blStuMain); - String b2_6_10(String id); + String b2_6_10(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_23(String id); + List> i2_23(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_24(String id); + List> t2_24(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_25(String id); + List> t2_25(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_26(String id); + List> i2_26(BlStuInfo blStuMain); - String b2_7_1(String id); + String b2_7_1(BlStuInfo blStuMain); - String b2_7_2(String id); + String b2_7_2(BlStuInfo blStuMain); - String b2_7_3(String id); + String b2_7_3(BlStuInfo blStuMain); - String b2_7_4(String id); + String b2_7_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_27(String id); + List> i2_27(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_28(String id); + List> t2_28(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_29(String id); + List> i2_29(BlStuInfo blStuMain); - String b2_8_1(String id); + String b2_8_1(BlStuInfo blStuMain); - String b2_8_2(String id); + String b2_8_2(BlStuInfo blStuMain); - String b2_8_3(String id); + String b2_8_3(BlStuInfo blStuMain); - String b2_8_4(String id); + String b2_8_4(BlStuInfo blStuMain); - String b2_8_5(String id); + String b2_8_5(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_30(String id); + List> i2_30(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_31(String id); + List> t2_31(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_32(String id); + List> t2_32(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_33(String id); + List> i2_33(BlStuInfo blStuMain); - String b2_9_1(String id); + String b2_9_1(BlStuInfo blStuMain); - String b2_9_2(String id); + String b2_9_2(BlStuInfo blStuMain); - String b2_9_3(String id); + String b2_9_3(BlStuInfo blStuMain); - String b2_9_4(String id); + String b2_9_4(BlStuInfo blStuMain); - String b2_9_5(String id); + String b2_9_5(BlStuInfo blStuMain); - String b2_9_6(String id); + String b2_9_6(BlStuInfo blStuMain); - String b2_9_7(String id); + String b2_9_7(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i2_34(String id); + List> i2_34(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_35(String id); + List> t2_35(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t2_36(String id); + List> t2_36(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i3_1(String id); + List> i3_1(BlStuInfo blStuMain); - String b3_1_1(String id); + String b3_1_1(BlStuInfo blStuMain); - String b3_1_2(String id); + String b3_1_2(BlStuInfo blStuMain); - String b3_1_3(String id); + String b3_1_3(BlStuInfo blStuMain); - String b3_1_4(String id); + String b3_1_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i3_2(String id); + List> i3_2(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t3_3(String id); + List> t3_3(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t3_4(String id); + List> t3_4(BlStuInfo blStuMain); - String b3_2_1(String id); + String b3_2_1(BlStuInfo blStuMain); - String b3_2_2(String id); + String b3_2_2(BlStuInfo blStuMain); - String b3_2_3(String id); + String b3_2_3(BlStuInfo blStuMain); - String b3_2_4(String id); + String b3_2_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i3_5(String id); + List> i3_5(BlStuInfo blStuMain); - String b3_2_5(String id); + String b3_2_5(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i3_6(String id); + List> i3_6(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t3_7(String id); + List> t3_7(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t3_8(String id); + List> t3_8(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i3_9(String id); + List> i3_9(BlStuInfo blStuMain); - String b3_3_1(String id); + String b3_3_1(BlStuInfo blStuMain); - String b3_3_2(String id); + String b3_3_2(BlStuInfo blStuMain); - String b3_3_3(String id); + String b3_3_3(BlStuInfo blStuMain); - String b3_3_4(String id); + String b3_3_4(BlStuInfo blStuMain); - String b3_3_5(String id); + String b3_3_5(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i3_10(String id); + List> i3_10(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t3_11(String id); + List> t3_11(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t3_12(String id); + List> t3_12(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i4_1(String id); + List> i4_1(BlStuInfo blStuMain); - String b4_1_1(String id); + String b4_1_1(BlStuInfo blStuMain); - String b4_1_2(String id); + String b4_1_2(BlStuInfo blStuMain); - String b4_1_3(String id); + String b4_1_3(BlStuInfo blStuMain); - String b4_1_4(String id); + String b4_1_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i4_2(String id); + List> i4_2(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t4_3(String id); + List> t4_3(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t4_4(String id); + List> t4_4(BlStuInfo blStuMain); - String b4_2_1(String id); + String b4_2_1(BlStuInfo blStuMain); - String b4_2_2(String id); + String b4_2_2(BlStuInfo blStuMain); - String b4_2_3(String id); + String b4_2_3(BlStuInfo blStuMain); - String b4_2_4(String id); + String b4_2_4(BlStuInfo blStuMain); - String b4_2_5(String id); + String b4_2_5(BlStuInfo blStuMain); - String b4_2_6(String id); + String b4_2_6(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i4_5(String id); + List> i4_5(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t4_6(String id); + List> t4_6(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t4_7(String id); + List> t4_7(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i4_8(String id); + List> i4_8(BlStuInfo blStuMain); - String b4_3_1(String id); + String b4_3_1(BlStuInfo blStuMain); - String b4_3_2(String id); + String b4_3_2(BlStuInfo blStuMain); - String b4_3_3(String id); + String b4_3_3(BlStuInfo blStuMain); - String b4_3_4(String id); + String b4_3_4(BlStuInfo blStuMain); - String b4_3_5(String id); + String b4_3_5(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i4_9(String id); + List> i4_9(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t4_10(String id); + List> t4_10(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t4_11(String id); + List> t4_11(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i4_12(String id); + List> i4_12(BlStuInfo blStuMain); - String b4_4_1(String id); + String b4_4_1(BlStuInfo blStuMain); - String b4_4_2(String id); + String b4_4_2(BlStuInfo blStuMain); - String b4_4_3(String id); + String b4_4_3(BlStuInfo blStuMain); - String b4_4_4(String id); + String b4_4_4(BlStuInfo blStuMain); - String b4_4_5(String id); + String b4_4_5(BlStuInfo blStuMain); - String b4_4_6(String id); + String b4_4_6(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i4_13(String id); + List> i4_13(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t4_14(String id); + List> t4_14(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t4_15(String id); + List> t4_15(BlStuInfo blStuMain); - String b5_1_1(String id); + String b5_1_1(BlStuInfo blStuMain); - String b5_1_2(String id); + String b5_1_2(BlStuInfo blStuMain); - String b5_1_3(String id); + String b5_1_3(BlStuInfo blStuMain); - String b5_1_4(String id); + String b5_1_4(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i5_1(String id); + List> i5_1(BlStuInfo blStuMain); - String b5_1_5(String id); + String b5_1_5(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> i5_2(String id); + List> i5_2(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t5_3(String id); + List> t5_3(BlStuInfo blStuMain); @InterceptorIgnore(tenantLine = "true") @MapKey("key") - List> t5_4(String id); + List> t5_4(BlStuInfo blStuMain); } 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 ea0ee14..01cf091 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 @@ -61,7 +61,7 @@ (select count('x') as yb_cnt from bl_stu_answer where main_id = #{id} and PRE_CLASS_PREVIEW = '一般')c, (select count('x') as bjb_cnt from bl_stu_answer where main_id = #{id} and PRE_CLASS_PREVIEW = '比较不符合')d, (select count('x') as fcb_cnt from bl_stu_answer where main_id = #{id} and PRE_CLASS_PREVIEW = '非常不符合')e, - (select count('x') as tot_cnt from bl_stu_answer)f + (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})f union all select '课堂上能跟上老师的讲解,主动提问或参与讨论,每节课学有所获' as 'key', round(round(a.fc_cnt/f.tot_cnt,2)*100) as '非常符合', @@ -74,7 +74,7 @@ (select count('x') as yb_cnt from bl_stu_answer where main_id = #{id} and IN_CLASS_QUESTIONS = '一般')c, (select count('x') as bjb_cnt from bl_stu_answer where main_id = #{id} and IN_CLASS_QUESTIONS = '比较不符合')d, (select count('x') as fcb_cnt from bl_stu_answer where main_id = #{id} and IN_CLASS_QUESTIONS = '非常不符合')e, - (select count('x') as tot_cnt from bl_stu_answer)f + (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})f union all select '课后复习笔记及总结课堂教学相关知识' as 'key', round(round(a.fc_cnt/f.tot_cnt,2)*100) as '非常符合', @@ -87,7 +87,7 @@ (select count('x') as yb_cnt from bl_stu_answer where main_id = #{id} and AFTER_CLASS_SUMMARY = '一般')c, (select count('x') as bjb_cnt from bl_stu_answer where main_id = #{id} and AFTER_CLASS_SUMMARY = '比较不符合')d, (select count('x') as fcb_cnt from bl_stu_answer where main_id = #{id} and AFTER_CLASS_SUMMARY = '非常不符合')e, - (select count('x') as tot_cnt from bl_stu_answer)f + (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})f union all select '除了阅读教材,还延伸阅读教师推荐的其他相关书目' as 'key', round(round(a.fc_cnt/f.tot_cnt,2)*100) as '非常符合', @@ -100,7 +100,7 @@ (select count('x') as yb_cnt from bl_stu_answer where main_id = #{id} and AFTER_CLASS_READ = '一般')c, (select count('x') as bjb_cnt from bl_stu_answer where main_id = #{id} and AFTER_CLASS_READ = '比较不符合')d, (select count('x') as fcb_cnt from bl_stu_answer where main_id = #{id} and AFTER_CLASS_READ = '非常不符合')e, - (select count('x') as tot_cnt from bl_stu_answer)f + (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})f select z.major as 'key',round(round(z.z_cnt/t.tot_cnt,2)*100) as '01',round(round(y.y_cnt/t.tot_cnt,2)*100) as '02',round(round(x.x_cnt/t.tot_cnt,2)*100) as '03',round(round(n.n_cnt/t.tot_cnt,2)*100) as '04' from - (select major,count('x') as z_cnt from bl_stu_answer where main_id = #{id} and EXCHANGE_FREQ = '每周至少一次' GROUP BY major)z, - (select major,count('x') as y_cnt from bl_stu_answer where main_id = #{id} and EXCHANGE_FREQ = '每月至少一次' GROUP BY major)y, - (select major,count('x') as x_cnt from bl_stu_answer where main_id = #{id} and EXCHANGE_FREQ = '每学期至少一次' GROUP BY major)x, - (select major,count('x') as n_cnt from bl_stu_answer where main_id = #{id} and EXCHANGE_FREQ = '每年至少一次' GROUP BY major)n, - (select major,count('x') as tot_cnt from bl_stu_answer where main_id = #{id} GROUP BY major)t + (select major,count('x') as z_cnt from bl_stu_answer where main_id = #{id} and EXCHANGE_FREQ = '每周至少一次' GROUP BY major HAVING count(*) > #{minNum})z, + (select major,count('x') as y_cnt from bl_stu_answer where main_id = #{id} and EXCHANGE_FREQ = '每月至少一次' GROUP BY major HAVING count(*) > #{minNum})y, + (select major,count('x') as x_cnt from bl_stu_answer where main_id = #{id} and EXCHANGE_FREQ = '每学期至少一次' GROUP BY major HAVING count(*) > #{minNum})x, + (select major,count('x') as n_cnt from bl_stu_answer where main_id = #{id} and EXCHANGE_FREQ = '每年至少一次' GROUP BY major HAVING count(*) > #{minNum})n, + (select major,count('x') as tot_cnt from bl_stu_answer where main_id = #{id} GROUP BY major HAVING count(*) > #{minNum})t where z.major = y.major and z.major = x.major and z.major = n.major and z.major = t.major GROUP BY z.major order by CONVERT(z.major USING gbk) COLLATE gbk_chinese_ci - select a.MAJOR as 'key',a.d1 as '01',b.d2 as '02',c.d3 as '03',d.d4 as '04',e.d5 as '05' from - (select major,round(avg(ACTISATI_SOCIETY2)) as d1 from bl_stu_answer where main_id = #{id} and ACTISATI_SOCIETY2 + 0 > 0 GROUP BY MAJOR)a, - (select major,round(avg(ACTISATI_CULTURE2)) as d2 from bl_stu_answer where main_id = #{id} and ACTISATI_CULTURE2 + 0 > 0 GROUP BY MAJOR)b, - (select major,round(avg(ACTISATI_INNO2)) as d3 from bl_stu_answer where main_id = #{id} and ACTISATI_INNO2 + 0 > 0 GROUP BY MAJOR)c, - (select major,round(avg(ACTISATI_GLOBAL2)) as d4 from bl_stu_answer where main_id = #{id} and ACTISATI_GLOBAL2 + 0 > 0 GROUP BY MAJOR)d, - (select major,round(avg(ACTISATI_INTERN2)) as d5 from bl_stu_answer where main_id = #{id} and ACTISATI_INTERN2 + 0 > 0 GROUP BY MAJOR)e + (select major,round(avg(ACTISATI_SOCIETY2)) as d1 from bl_stu_answer where main_id = #{id} and ACTISATI_SOCIETY2 + 0 > 0 GROUP BY MAJOR HAVING count(*) > #{minNum})a, + (select major,round(avg(ACTISATI_CULTURE2)) as d2 from bl_stu_answer where main_id = #{id} and ACTISATI_CULTURE2 + 0 > 0 GROUP BY MAJOR HAVING count(*) > #{minNum})b, + (select major,round(avg(ACTISATI_INNO2)) as d3 from bl_stu_answer where main_id = #{id} and ACTISATI_INNO2 + 0 > 0 GROUP BY MAJOR HAVING count(*) > #{minNum})c, + (select major,round(avg(ACTISATI_GLOBAL2)) as d4 from bl_stu_answer where main_id = #{id} and ACTISATI_GLOBAL2 + 0 > 0 GROUP BY MAJOR HAVING count(*) > #{minNum})d, + (select major,round(avg(ACTISATI_INTERN2)) as d5 from bl_stu_answer where main_id = #{id} and ACTISATI_INTERN2 + 0 > 0 GROUP BY MAJOR HAVING count(*) > #{minNum})e where a.major = b.MAJOR and a.major = c.MAJOR and a.major = d.MAJOR @@ -1465,7 +1486,10 @@ 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 CONVERT(major USING gbk) COLLATE gbk_chinese_ci + from bl_stu_answer where main_id = #{id} + GROUP BY major + HAVING count(*) > #{minNum} + order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci select concat(round(round(a.fc_cnt/b.tot_cnt,2)*100)) from - (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and TEACHERSATI_ZONGTI = '比较不满意')a, + (select count('x') as fc_cnt from bl_stu_answer where main_id = #{id} and TEACHERSATI_ZONGTI = '一般')a, (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})b @@ -1840,7 +1870,10 @@ \ No newline at end of file diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java index 375f086..e78091c 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blStuAnswer/service/impl/BlStuAnswerServiceImpl.java @@ -18,6 +18,7 @@ import org.jeecg.modules.demo.blStuInfo.entity.BlStuInfo; import org.jeecg.modules.demo.blStuInfo.mapper.BlStuInfoMapper; import org.jeecg.modules.tools.WebDriverUtil; import org.jeecg.modules.tools.word.ExportWord; +import org.jeecg.modules.tools.word.TableMerge; import org.jeecg.modules.tools.word.WordOperator; import org.springframework.stereotype.Service; @@ -60,7 +61,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl threadService = ThreadUtil.newCompletionService(Executors.newFixedThreadPool(100)); List> calls = Lists.newArrayList(); + List allMergeList = Lists.newArrayList(); calls.add(() -> { - t1_1(wo, result, id); + var mergeList = t1_1(wo, result, blStuMain); + allMergeList.addAll(mergeList); return true; }); calls.add(() -> { - i1_1(wo, result, id); + i1_1(wo, result, blStuMain); return true; }); calls.add(() -> { - b1_1(wo, result, id); + b1_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i1_2(wo, result, id); + i1_2(wo, result, blStuMain); return true; }); calls.add(() -> { - t1_3(wo, result, id); + t1_3(wo, result, blStuMain); return true; }); calls.add(() -> { - t1_4(wo, result, id); + t1_4(wo, result, blStuMain); return true; }); calls.add(() -> { - b1_2(wo, result, id); + b1_2(wo, result, blStuMain); return true; }); calls.add(() -> { - t1_5(wo, result, id); + t1_5(wo, result, blStuMain); return true; }); calls.add(() -> { - t1_6(wo, result, id); + t1_6(wo, result, blStuMain); return true; }); calls.add(() -> { - b1_2_5(wo, result, id); + b1_2_5(wo, result, blStuMain); return true; }); calls.add(() -> { - t1_7(wo, result, id); + t1_7(wo, result, blStuMain); return true; }); calls.add(() -> { - t1_8(wo, result, id); + t1_8(wo, result, blStuMain); return true; }); calls.add(() -> { - b1_3(wo, result, id); + b1_3(wo, result, blStuMain); return true; }); calls.add(() -> { - i1_9(wo, result, id); + i1_9(wo, result, blStuMain); return true; }); calls.add(() -> { - t1_10(wo, result, id); + t1_10(wo, result, blStuMain); return true; }); calls.add(() -> { - t1_11(wo, result, id); + t1_11(wo, result, blStuMain); return true; }); calls.add(() -> { - b1_4(wo, result, id); + b1_4(wo, result, blStuMain); return true; }); calls.add(() -> { - i1_12(wo, result, id); + i1_12(wo, result, blStuMain); return true; }); calls.add(() -> { - i1_13(wo, result, id); + i1_13(wo, result, blStuMain); return true; }); calls.add(() -> { - t1_14(wo, result, id); + t1_14(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_1(wo, result, id); + b2_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_1(wo, result, id); + i2_1(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_1_5(wo, result, id); + b2_1_5(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_2(wo, result, id); + i2_2(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_3(wo, result, id); + t2_3(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_4(wo, result, id); + t2_4(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_5(wo, result, id); + i2_5(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_1_6(wo, result, id); + b2_1_6(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_6(wo, result, id); + i2_6(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_7(wo, result, id); + t2_7(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_8(wo, result, id); + i2_8(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_2_1(wo, result, id); + b2_2_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_9(wo, result, id); + i2_9(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_10(wo, result, id); + t2_10(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_11(wo, result, id); + t2_11(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_12(wo, result, id); + i2_12(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_3_1(wo, result, id); + b2_3_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_13(wo, result, id); + i2_13(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_14(wo, result, id); + t2_14(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_15(wo, result, id); + t2_15(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_4_1(wo, result, id); + b2_4_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_16(wo, result, id); + i2_16(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_17(wo, result, id); + i2_17(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_5_1(wo, result, id); + b2_5_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_18(wo, result, id); + i2_18(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_19(wo, result, id); + t2_19(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_20(wo, result, id); + t2_20(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_6_1(wo, result, id); + b2_6_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_21(wo, result, id); + i2_21(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_22(wo, result, id); + i2_22(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_6_6(wo, result, id); + b2_6_6(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_23(wo, result, id); + i2_23(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_24(wo, result, id); + t2_24(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_25(wo, result, id); + t2_25(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_26(wo, result, id); + i2_26(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_7_1(wo, result, id); + b2_7_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_27(wo, result, id); + i2_27(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_28(wo, result, id); + t2_28(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_29(wo, result, id); + i2_29(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_8_1(wo, result, id); + b2_8_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_30(wo, result, id); + i2_30(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_31(wo, result, id); + t2_31(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_32(wo, result, id); + t2_32(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_33(wo, result, id); + i2_33(wo, result, blStuMain); return true; }); calls.add(() -> { - b2_9_1(wo, result, id); + b2_9_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i2_34(wo, result, id); + i2_34(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_35(wo, result, id); + t2_35(wo, result, blStuMain); return true; }); calls.add(() -> { - t2_36(wo, result, id); + t2_36(wo, result, blStuMain); return true; }); calls.add(() -> { - i3_1(wo, result, id); + i3_1(wo, result, blStuMain); return true; }); calls.add(() -> { - b3_1_1(wo, result, id); + b3_1_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i3_2(wo, result, id); + i3_2(wo, result, blStuMain); return true; }); calls.add(() -> { - t3_3(wo, result, id); + t3_3(wo, result, blStuMain); return true; }); calls.add(() -> { - t3_4(wo, result, id); + t3_4(wo, result, blStuMain); return true; }); calls.add(() -> { - b3_2_1(wo, result, id); + b3_2_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i3_5(wo, result, id); + i3_5(wo, result, blStuMain); return true; }); calls.add(() -> { - b3_2_5(wo, result, id); + b3_2_5(wo, result, blStuMain); return true; }); calls.add(() -> { - i3_6(wo, result, id); + i3_6(wo, result, blStuMain); return true; }); calls.add(() -> { - t3_7(wo, result, id); + t3_7(wo, result, blStuMain); return true; }); calls.add(() -> { - t3_8(wo, result, id); + t3_8(wo, result, blStuMain); return true; }); calls.add(() -> { - i3_9(wo, result, id); + i3_9(wo, result, blStuMain); return true; }); calls.add(() -> { - b3_3_1(wo, result, id); + b3_3_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i3_10(wo, result, id); + i3_10(wo, result, blStuMain); return true; }); calls.add(() -> { - t3_11(wo, result, id); + t3_11(wo, result, blStuMain); return true; }); calls.add(() -> { - t3_12(wo, result, id); + t3_12(wo, result, blStuMain); return true; }); calls.add(() -> { - i4_1(wo, result, id); + i4_1(wo, result, blStuMain); return true; }); calls.add(() -> { - b4_1_1(wo, result, id); + b4_1_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i4_2(wo, result, id); + i4_2(wo, result, blStuMain); return true; }); calls.add(() -> { - t4_3(wo, result, id); + t4_3(wo, result, blStuMain); return true; }); calls.add(() -> { - t4_4(wo, result, id); + t4_4(wo, result, blStuMain); return true; }); calls.add(() -> { - b4_2_1(wo, result, id); + b4_2_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i4_5(wo, result, id); + i4_5(wo, result, blStuMain); return true; }); calls.add(() -> { - t4_6(wo, result, id); + t4_6(wo, result, blStuMain); return true; }); calls.add(() -> { - t4_7(wo, result, id); + t4_7(wo, result, blStuMain); return true; }); calls.add(() -> { - i4_8(wo, result, id); + i4_8(wo, result, blStuMain); return true; }); calls.add(() -> { - b4_3_1(wo, result, id); + b4_3_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i4_9(wo, result, id); + i4_9(wo, result, blStuMain); return true; }); calls.add(() -> { - t4_10(wo, result, id); + t4_10(wo, result, blStuMain); return true; }); calls.add(() -> { - t4_11(wo, result, id); + t4_11(wo, result, blStuMain); return true; }); calls.add(() -> { - i4_12(wo, result, id); + i4_12(wo, result, blStuMain); return true; }); calls.add(() -> { - b4_4_1(wo, result, id); + b4_4_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i4_13(wo, result, id); + i4_13(wo, result, blStuMain); return true; }); calls.add(() -> { - t4_14(wo, result, id); + t4_14(wo, result, blStuMain); return true; }); calls.add(() -> { - t4_15(wo, result, id); + t4_15(wo, result, blStuMain); return true; }); calls.add(() -> { - b5_1_1(wo, result, id); + b5_1_1(wo, result, blStuMain); return true; }); calls.add(() -> { - i5_1(wo, result, id); + i5_1(wo, result, blStuMain); return true; }); calls.add(() -> { - b5_1_5(wo, result, id); + b5_1_5(wo, result, blStuMain); return true; }); calls.add(() -> { - i5_2(wo, result, id); + i5_2(wo, result, blStuMain); return true; }); calls.add(() -> { - t5_3(wo, result, id); + t5_3(wo, result, blStuMain); return true; }); calls.add(() -> { - t5_4(wo, result, id); + t5_4(wo, result, blStuMain); return true; }); @@ -537,15 +540,20 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list1 = baseMapper.t1_1_1(id); - //t1_1_1~t1_2_2 - var list2 = baseMapper.t1_1_2(id); - //t1_3_1~t1_6_2 - var list3 = baseMapper.t1_1_3(id); - //t1_10_1~t1_91_2 - var list4 = baseMapper.viewBlMajorStatic(id); - //t1_10_1~t91_2 - //套list - //view_bl_major_static - //list1.forEach(x -> ); - Map keyMap = MapUtil.of(new String[][] { - {"男", "t1_1_"}, - {"女", "t1_2_"}, - {"大一", "t1_3_"}, - {"大二", "t1_4_"}, - {"大三", "t1_5_"}, - {"大四", "t1_6_"}, - {"中共党员(含预备党员)", "t1_7_"}, - {"共青团员", "t1_8_"}, - {"群众", "t1_9_"}, - {"会计学院-会计学","t1_10_"}, - {"会计学院-会计学(ACCA)","t1_11_"}, - {"会计学院-会计学(CIMA)","t1_12_"}, - {"会计学院-财务管理","t1_13_"}, - {"会计学院-会计学(智能会计)","t1_14_"}, - {"会计学院 小计-","t1_15_"}, - {"虚拟现实(VR)现代产业学院-软件工程(VR软件开发)","t1_16_"}, - {"虚拟现实(VR)现代产业学院-虚拟现实技术","t1_17_"}, - {"虚拟现实(VR)现代产业学院-数字媒体艺术(VR艺术设计)","t1_18_"}, - {"虚拟现实(VR)现代产业学院 小计-","t1_19_"}, - {"软件与物联网工程学院-软件工程","t1_20_"}, - {"软件与物联网工程学院-物联网工程","t1_21_"}, - {"软件与物联网工程学院-软件工程(中外合作办学)","t1_22_"}, - {"软件与物联网工程学院 小计-","t1_23_"}, - {"工商管理学院-工商管理","t1_24_"}, - {"工商管理学院-人力资源管理","t1_25_"}, - {"工商管理学院-市场营销","t1_26_"}, - {"工商管理学院-市场营销(国际营销)","t1_27_"}, - {"工商管理学院-物流管理","t1_28_"}, - {"工商管理学院-旅游管理","t1_29_"}, - {"工商管理学院 小计-","t1_30_"}, - {"信息管理学院-信息与计算科学","t1_31_"}, - {"信息管理学院-工程管理","t1_32_"}, - {"信息管理学院-计算机科学与技术","t1_33_"}, - {"信息管理学院-数据科学与大数据技术","t1_34_"}, - {"信息管理学院-房地产开发与管理","t1_35_"}, - {"信息管理学院-信息管理与信息系统","t1_36_"}, - {"信息管理学院-管理科学","t1_37_"}, - {"信息管理学院-网络空间安全","t1_38_"}, - {"信息管理学院 小计-","t1_39_"}, - {"金融学院-金融科技","t1_40_"}, - {"金融学院-金融学","t1_41_"}, - {"金融学院-金融学(FRM)","t1_42_"}, - {"金融学院-金融工程","t1_43_"}, - {"金融学院-保险学","t1_44_"}, - {"金融学院 小计-","t1_45_"}, - {"法学院-法学","t1_46_"}, - {"法学院-法学(数据法学)","t1_47_"}, - {"法学院-法学(法务会计)","t1_48_"}, - {"法学院 小计-","t1_49_"}, - {"国际学院-金融学(CFA-注册金融分析师)","t1_50_"}, - {"国际学院-会计学(国际会计)","t1_51_"}, - {"国际学院-金融学(国际投资与金融)","t1_52_"}, - {"国际学院-国际经济与贸易(CITF-特许国际金融师)","t1_53_"}, - {"国际学院 小计-","t1_54_"}, - {"财税与公共管理学院-税收学","t1_55_"}, - {"财税与公共管理学院-土地资源管理","t1_56_"}, - {"财税与公共管理学院-财政学","t1_57_"}, - {"财税与公共管理学院-财政学(智慧财税)","t1_58_"}, - {"财税与公共管理学院-行政管理","t1_59_"}, - {"财税与公共管理学院-劳动与社会保障","t1_60_"}, - {"财税与公共管理学院 小计-","t1_61_"}, - {"国际经贸学院-国际商务","t1_62_"}, - {"国际经贸学院-电子商务","t1_63_"}, - {"国际经贸学院-国际经济与贸易","t1_64_"}, - {"国际经贸学院 小计-","t1_65_"}, - {"统计与数据科学学院-应用统计学","t1_66_"}, - {"统计与数据科学学院-经济统计学","t1_67_"}, - {"统计与数据科学学院-精算学","t1_68_"}, - {"统计与数据科学学院 小计-","t1_69_"}, - {"经济学院-经济学","t1_70_"}, - {"经济学院-国民经济管理","t1_71_"}, - {"经济学院-数字经济(中外合作办学)","t1_72_"}, - {"经济学院 小计-","t1_73_"}, - {"艺术学院-环境设计","t1_74_"}, - {"艺术学院-产品设计","t1_75_"}, - {"艺术学院-数字媒体艺术","t1_76_"}, - {"艺术学院-舞蹈表演","t1_77_"}, - {"艺术学院-音乐学","t1_78_"}, - {"艺术学院 小计-","t1_79_"}, - {"人文学院-汉语国际教育","t1_80_"}, - {"人文学院-新闻学","t1_81_"}, - {"人文学院-社会工作","t1_82_"}, - {"人文学院 小计-","t1_83_"}, - {"应用经济学院(数字经济学院)-数字经济","t1_84_"}, - {"应用经济学院(数字经济学院) 小计-","t1_85_"}, - {"外国语学院-商务英语","t1_86_"}, - {"外国语学院-日语","t1_87_"}, - {"外国语学院 小计-","t1_88_"}, - {"体育学院-社会体育指导与管理","t1_89_"}, - {"体育学院-运动训练","t1_90_"}, - {"体育学院 小计-","t1_91_"}, - }); - Consumer> fn = x -> { - var key = keyMap.get(x.get(KEY)); - result.put(key + "1", getMapStr(x.get(K01))); - result.put(key + "2", getMapStr(x.get(K02))); - }; - list1.forEach(fn); - list2.forEach(fn); - list3.forEach(fn); - list4.forEach(x -> { - var key = keyMap.get(x.get(KEY)); - result.put(key + "1", getMapStr(x.get(K03))); - result.put(key + "2", getMapStr(x.get(K04))); - }); -// result.put("t1_1_1", "默认值"); -// result.put("t1_1_2", "默认值"); -// //~ -// result.put("t1_91_1", "默认值"); -// result.put("t1_91_2", "默认值"); - //wo.insert2Table(0,1,) - } - - public void t1_1(WordOperator wo, Map result, String id) { - var list1 = baseMapper.t1_1_1(id); + public List t1_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list1 = baseMapper.t1_1_1(blStuMain); //t1_1_1~t1_2_2 - var list2 = baseMapper.t1_1_2(id); + var list2 = baseMapper.t1_1_2(blStuMain); //t1_3_1~t1_6_2 - var list3 = baseMapper.t1_1_3(id); + var list3 = baseMapper.t1_1_3(blStuMain); //t1_10_1~t1_91_2 - var list4 = baseMapper.viewBlMajorStatic2(id); + var list4 = baseMapper.viewBlMajorStatic2(blStuMain); //t1_10_1~t91_2 //套list //view_bl_major_static @@ -1142,6 +1033,12 @@ public class BlStuAnswerServiceImpl extends ServiceImpl> table = Lists.newArrayList(); + List mergeList = Lists.newArrayList(); + int tableIndex = 0; + int col = 0; + AtomicInteger startRow = new AtomicInteger(10); + AtomicInteger endRow = new AtomicInteger(0); + majorMap.forEach((k,v) -> { v.forEach((k2,v2) -> { List row = Lists.newArrayList(); @@ -1160,9 +1057,15 @@ public class BlStuAnswerServiceImpl extends ServiceImpl sumRow = Lists.newArrayList(); //学院 + 小计 @@ -1183,25 +1086,28 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i1_1(id); + public void i1_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i1_1(blStuMain); String imagePath = getStackHistogram(list, true, null, "30", "20"); result.put("i1_1", imagePath); log.info(imagePath); } - public void b1_1(WordOperator wo, Map result, String id) { - result.put("b1_1_1", getMapStr(baseMapper.b1_1_1(id))); - result.put("b1_1_2", getMapStr(baseMapper.b1_1_2(id))); - result.put("b1_1_3", getMapStr(baseMapper.b1_1_3(id))); - result.put("b1_1_4", getMapStr(baseMapper.b1_1_4(id))); + public void b1_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b1_1_1", getMapStr(baseMapper.b1_1_1(blStuMain))); + result.put("b1_1_2", getMapStr(baseMapper.b1_1_2(blStuMain))); + result.put("b1_1_3", getMapStr(baseMapper.b1_1_3(blStuMain))); + result.put("b1_1_4", getMapStr(baseMapper.b1_1_4(blStuMain))); } //图片i1_2 - public void i1_2(WordOperator wo, Map result, String id) { - var list = baseMapper.i1_2(id); + public void i1_2(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i1_2(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart(list.get(0)); result.put("i1_2", imagePath); @@ -1210,8 +1116,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t1_3(id); + public void t1_3(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t1_3(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1227,8 +1133,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t1_4(id); + public void t1_4(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t1_4(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1243,17 +1149,17 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - result.put("b1_2_1", getMapStr(baseMapper.b1_2_1(id))); - result.put("b1_2_2", getMapStr(baseMapper.b1_2_2(id))); - result.put("b1_2_3", getMapStr(baseMapper.b1_2_3(id))); - result.put("b1_2_4", getMapStr(baseMapper.b1_2_4(id))); + public void b1_2(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b1_2_1", getMapStr(baseMapper.b1_2_1(blStuMain))); + result.put("b1_2_2", getMapStr(baseMapper.b1_2_2(blStuMain))); + result.put("b1_2_3", getMapStr(baseMapper.b1_2_3(blStuMain))); + result.put("b1_2_4", getMapStr(baseMapper.b1_2_4(blStuMain))); } //表格 t1_5 //课外学习各方面 总体 大一 大二 大三 大四 - public void t1_5(WordOperator wo, Map result, String id) { - var list = baseMapper.t1_5(id); + public void t1_5(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t1_5(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1270,8 +1176,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t1_6(id); + public void t1_6(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t1_6(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1285,17 +1191,17 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - result.put("b1_2_5", getMapStr(baseMapper.b1_2_5(id))); - result.put("b1_2_6", getMapStr(baseMapper.b1_2_6(id))); - result.put("b1_2_7", getMapStr(baseMapper.b1_2_7(id))); - result.put("b1_2_8", getMapStr(baseMapper.b1_2_8(id))); + public void b1_2_5(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b1_2_5", getMapStr(baseMapper.b1_2_5(blStuMain))); + result.put("b1_2_6", getMapStr(baseMapper.b1_2_6(blStuMain))); + result.put("b1_2_7", getMapStr(baseMapper.b1_2_7(blStuMain))); + result.put("b1_2_8", getMapStr(baseMapper.b1_2_8(blStuMain))); } //表格 t1_7 //课外活动各方面 总体 大一 大二 大三 大四 - public void t1_7(WordOperator wo, Map result, String id) { - var list = baseMapper.t1_7(id); + public void t1_7(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t1_7(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1312,8 +1218,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t1_8(id); + public void t1_8(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t1_8(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1328,24 +1234,24 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - result.put("b1_3_1", getMapStr(baseMapper.b1_3_1(id))); - result.put("b1_3_2", getMapStr(baseMapper.b1_3_2(id))); - result.put("b1_3_3", getMapStr(baseMapper.b1_3_3(id))); - result.put("b1_3_4", getMapStr(baseMapper.b1_3_4(id))); + public void b1_3(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b1_3_1", getMapStr(baseMapper.b1_3_1(blStuMain))); + result.put("b1_3_2", getMapStr(baseMapper.b1_3_2(blStuMain))); + result.put("b1_3_3", getMapStr(baseMapper.b1_3_3(blStuMain))); + result.put("b1_3_4", getMapStr(baseMapper.b1_3_4(blStuMain))); } //图片i1_9 - public void i1_9(WordOperator wo, Map result, String id) { - var list = baseMapper.i1_9(id); + public void i1_9(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i1_9(blStuMain); String imagePath = getStackHistogram(list); result.put("i1_9", imagePath); } //表格 t1_10 //同辈互动各方面 大一 大二 大三 大四 - public void t1_10(WordOperator wo, Map result, String id) { - var list = baseMapper.t1_10(id); + public void t1_10(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t1_10(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1361,8 +1267,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t1_11(id); + public void t1_11(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t1_11(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1377,29 +1283,29 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - result.put("b1_4_1", getMapStr(baseMapper.b1_4_1(id))); - result.put("b1_4_2", getMapStr(baseMapper.b1_4_2(id))); + public void b1_4(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b1_4_1", getMapStr(baseMapper.b1_4_1(blStuMain))); + result.put("b1_4_2", getMapStr(baseMapper.b1_4_2(blStuMain))); } //图片i1_12 - public void i1_12(WordOperator wo, Map result, String id) { - var list = baseMapper.i1_12(id); + public void i1_12(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i1_12(blStuMain); String imagePath = getBaseHistogram(list); result.put("i1_12", imagePath); } //图片i1_13 - public void i1_13(WordOperator wo, Map result, String id) { - var list = baseMapper.i1_13(id); + public void i1_13(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i1_13(blStuMain); String imagePath = getStackHistogram(list); result.put("i1_13", imagePath); } //表格 t1_14 //专业名称 每周至少一次 每月至少一次 每学期至少一次 每年至少一次 - public void t1_14(WordOperator wo, Map result, String id) { - var list = baseMapper.t1_14(id); + public void t1_14(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t1_14(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1414,33 +1320,33 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - result.put("b2_1_1", getMapStr(baseMapper.b2_1_1(id))); - result.put("b2_1_2", getMapStr(baseMapper.b2_1_2(id))); - result.put("b2_1_3", getMapStr(baseMapper.b2_1_3(id))); - result.put("b2_1_4", getMapStr(baseMapper.b2_1_4(id))); + public void b2_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_1_1", getMapStr(baseMapper.b2_1_1(blStuMain))); + result.put("b2_1_2", getMapStr(baseMapper.b2_1_2(blStuMain))); + result.put("b2_1_3", getMapStr(baseMapper.b2_1_3(blStuMain))); + result.put("b2_1_4", getMapStr(baseMapper.b2_1_4(blStuMain))); } //图片i2_1 - public void i2_1(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_1(id); + public void i2_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_1(blStuMain); String imagePath = getStackHistogram(list); result.put("i2_1", imagePath); } - public void b2_1_5(WordOperator wo, Map result, String id) { - result.put("b2_1_5", getMapStr(baseMapper.b2_1_5(id))); + public void b2_1_5(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_1_5", getMapStr(baseMapper.b2_1_5(blStuMain))); } //图片i2_2 - public void i2_2(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_2(id); + public void i2_2(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_2(blStuMain); String imagePath = getBaseHistogram(list); result.put("i2_2", imagePath); } //表格 t2_3 // 大一 大二 大三 大四 - public void t2_3(WordOperator wo, Map result, String id) { - var list = baseMapper.t2_3(id); + public void t2_3(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_3(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1455,8 +1361,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_4(id); + public void t2_4(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_4(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1468,23 +1374,23 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i2_5(id); + public void i2_5(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_5(blStuMain); String imagePath = getStackHistogram(list); result.put("i2_5", imagePath); } //b2_1_6~9 - public void b2_1_6(WordOperator wo, Map result, String id) { - result.put("b2_1_6", getMapStr(baseMapper.b2_1_6(id))); - result.put("b2_1_7", getMapStr(baseMapper.b2_1_7(id))); - result.put("b2_1_8", getMapStr(baseMapper.b2_1_8(id))); - result.put("b2_1_9", getMapStr(baseMapper.b2_1_9(id))); + public void b2_1_6(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_1_6", getMapStr(baseMapper.b2_1_6(blStuMain))); + result.put("b2_1_7", getMapStr(baseMapper.b2_1_7(blStuMain))); + result.put("b2_1_8", getMapStr(baseMapper.b2_1_8(blStuMain))); + result.put("b2_1_9", getMapStr(baseMapper.b2_1_9(blStuMain))); } //图片i2_6 - public void i2_6(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_6(id); + public void i2_6(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_6(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart100(list.get(0)); result.put("i2_6", imagePath); @@ -1493,8 +1399,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_7(id); + public void t2_7(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_7(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1508,34 +1414,34 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i2_8(id); - var imagePath = getStackHistogram(list); + public void i2_8(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_8(blStuMain); + var imagePath = getStackHistogram(list, true, "600", null, null); result.put("i2_8", imagePath); } //b2_2_1~6 - public void b2_2_1(WordOperator wo, Map result, String id) { - result.put("b2_2_1", getMapStr(baseMapper.b2_2_1(id))); - result.put("b2_2_2", getMapStr(baseMapper.b2_2_2(id))); - result.put("b2_2_3", getMapStr(baseMapper.b2_2_3(id))); - result.put("b2_2_4", getMapStr(baseMapper.b2_2_4(id))); - result.put("b2_2_5", getMapStr(baseMapper.b2_2_5(id))); - result.put("b2_2_6", getMapStr(baseMapper.b2_2_6(id))); + public void b2_2_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_2_1", getMapStr(baseMapper.b2_2_1(blStuMain))); + result.put("b2_2_2", getMapStr(baseMapper.b2_2_2(blStuMain))); + result.put("b2_2_3", getMapStr(baseMapper.b2_2_3(blStuMain))); + result.put("b2_2_4", getMapStr(baseMapper.b2_2_4(blStuMain))); + result.put("b2_2_5", getMapStr(baseMapper.b2_2_5(blStuMain))); + result.put("b2_2_6", getMapStr(baseMapper.b2_2_6(blStuMain))); } //图片i2_9 - public void i2_9(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_9(id); + public void i2_9(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_9(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart(list.get(0)); result.put("i2_9", imagePath); } } //表格 t2_10 这个需要再看看,有合并行 - public void t2_10(WordOperator wo, Map result, String id) { + public void t2_10(WordOperator wo, Map result, BlStuInfo blStuMain) { //TODO 需要聚合第一列 - var list = baseMapper.t2_10(id); + var list = baseMapper.t2_10(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1551,8 +1457,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_11(id); + public void t2_11(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_11(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1569,22 +1475,22 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i2_12(id); + public void i2_12(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_12(blStuMain); var imagePath = getStackHistogram(list); result.put("i2_12", imagePath); } //b2_3_1~4 - public void b2_3_1(WordOperator wo, Map result, String id) { - result.put("b2_3_1", getMapStr(baseMapper.b2_3_1(id))); - result.put("b2_3_2", getMapStr(baseMapper.b2_3_2(id))); - result.put("b2_3_3", getMapStr(baseMapper.b2_3_3(id))); - result.put("b2_3_4", getMapStr(baseMapper.b2_3_4(id))); + public void b2_3_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_3_1", getMapStr(baseMapper.b2_3_1(blStuMain))); + result.put("b2_3_2", getMapStr(baseMapper.b2_3_2(blStuMain))); + result.put("b2_3_3", getMapStr(baseMapper.b2_3_3(blStuMain))); + result.put("b2_3_4", getMapStr(baseMapper.b2_3_4(blStuMain))); } //图片i2_13 - public void i2_13(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_13(id); + public void i2_13(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_13(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart(list.get(0)); result.put("i2_13", imagePath); @@ -1592,8 +1498,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_14(id); + public void t2_14(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_14(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1609,8 +1515,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_15(id); + public void t2_15(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_15(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1625,38 +1531,38 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - result.put("b2_4_1", getMapStr(baseMapper.b2_4_1(id))); - result.put("b2_4_2", getMapStr(baseMapper.b2_4_2(id))); - result.put("b2_4_3", getMapStr(baseMapper.b2_4_3(id))); - result.put("b2_4_4", getMapStr(baseMapper.b2_4_4(id))); - result.put("b2_4_5", getMapStr(baseMapper.b2_4_5(id))); - result.put("b2_4_6", getMapStr(baseMapper.b2_4_6(id))); + public void b2_4_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_4_1", getMapStr(baseMapper.b2_4_1(blStuMain))); + result.put("b2_4_2", getMapStr(baseMapper.b2_4_2(blStuMain))); + result.put("b2_4_3", getMapStr(baseMapper.b2_4_3(blStuMain))); + result.put("b2_4_4", getMapStr(baseMapper.b2_4_4(blStuMain))); + result.put("b2_4_5", getMapStr(baseMapper.b2_4_5(blStuMain))); + result.put("b2_4_6", getMapStr(baseMapper.b2_4_6(blStuMain))); } //图片i2_16 - public void i2_16(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_16(id); + public void i2_16(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_16(blStuMain); var imagePath = getBaseTransverseHistogram(list); result.put("i2_16", imagePath); } //图片i2_17 - public void i2_17(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_17(id); + public void i2_17(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_17(blStuMain); var imagePath = getStackHistogram(list); result.put("i2_17", imagePath); } //b2_5_1~3 - public void b2_5_1(WordOperator wo, Map result, String id) { - result.put("b2_5_1", getMapStr(baseMapper.b2_5_1(id))); - result.put("b2_5_2", getMapStr(baseMapper.b2_5_2(id))); - result.put("b2_5_3", getMapStr(baseMapper.b2_5_3(id))); + public void b2_5_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_5_1", getMapStr(baseMapper.b2_5_1(blStuMain))); + result.put("b2_5_2", getMapStr(baseMapper.b2_5_2(blStuMain))); + result.put("b2_5_3", getMapStr(baseMapper.b2_5_3(blStuMain))); } //图片i2_18 - public void i2_18(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_18(id); + public void i2_18(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_18(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart100(list.get(0)); result.put("i2_18", imagePath); @@ -1664,8 +1570,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_19(id); + public void t2_19(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_19(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1680,8 +1586,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_20(id); + public void t2_20(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_20(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1694,40 +1600,40 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - result.put("b2_6_1", getMapStr(baseMapper.b2_6_1(id))); - result.put("b2_6_2", getMapStr(baseMapper.b2_6_2(id))); - result.put("b2_6_3", getMapStr(baseMapper.b2_6_3(id))); - result.put("b2_6_4", getMapStr(baseMapper.b2_6_4(id))); - result.put("b2_6_5", getMapStr(baseMapper.b2_6_5(id))); + public void b2_6_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_6_1", getMapStr(baseMapper.b2_6_1(blStuMain))); + result.put("b2_6_2", getMapStr(baseMapper.b2_6_2(blStuMain))); + result.put("b2_6_3", getMapStr(baseMapper.b2_6_3(blStuMain))); + result.put("b2_6_4", getMapStr(baseMapper.b2_6_4(blStuMain))); + result.put("b2_6_5", getMapStr(baseMapper.b2_6_5(blStuMain))); } //图片i2_21 - public void i2_21(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_21(id); + public void i2_21(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_21(blStuMain); var imagePath = getBaseTransverseHistogram(list); result.put("i2_21", imagePath); } //图片i2_22 - public void i2_22(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_22(id); + public void i2_22(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_22(blStuMain); var imagePath = getStackHistogram(list); result.put("i2_22", imagePath); } //b2_6_6~10 - public void b2_6_6(WordOperator wo, Map result, String id) { - result.put("b2_6_6", getMapStr(baseMapper.b2_6_6(id))); - result.put("b2_6_7", getMapStr(baseMapper.b2_6_7(id))); - result.put("b2_6_8", getMapStr(baseMapper.b2_6_8(id))); - result.put("b2_6_9", getMapStr(baseMapper.b2_6_9(id))); - result.put("b2_6_10", getMapStr(baseMapper.b2_6_10(id))); + public void b2_6_6(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_6_6", getMapStr(baseMapper.b2_6_6(blStuMain))); + result.put("b2_6_7", getMapStr(baseMapper.b2_6_7(blStuMain))); + result.put("b2_6_8", getMapStr(baseMapper.b2_6_8(blStuMain))); + result.put("b2_6_9", getMapStr(baseMapper.b2_6_9(blStuMain))); + result.put("b2_6_10", getMapStr(baseMapper.b2_6_10(blStuMain))); } //图片i2_23 - public void i2_23(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_23(id); + public void i2_23(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_23(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart100(list.get(0)); result.put("i2_23", imagePath); @@ -1736,8 +1642,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_24(id); + public void t2_24(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_24(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1753,8 +1659,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_25(id); + public void t2_25(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_25(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1770,30 +1676,30 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i2_26(id); + public void i2_26(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_26(blStuMain); var imagePath = getStackHistogram(list); result.put("i2_26", imagePath); } //b2_7_1~4 - public void b2_7_1(WordOperator wo, Map result, String id) { - result.put("b2_7_1", getMapStr(baseMapper.b2_7_1(id))); - result.put("b2_7_2", getMapStr(baseMapper.b2_7_2(id))); - result.put("b2_7_3", getMapStr(baseMapper.b2_7_3(id))); - result.put("b2_7_4", getMapStr(baseMapper.b2_7_4(id))); + public void b2_7_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_7_1", getMapStr(baseMapper.b2_7_1(blStuMain))); + result.put("b2_7_2", getMapStr(baseMapper.b2_7_2(blStuMain))); + result.put("b2_7_3", getMapStr(baseMapper.b2_7_3(blStuMain))); + result.put("b2_7_4", getMapStr(baseMapper.b2_7_4(blStuMain))); } //图片i2_27 - public void i2_27(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_27(id); + public void i2_27(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_27(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart100(list.get(0)); result.put("i2_27", imagePath); } } //图片i2_28 - public void t2_28(WordOperator wo, Map result, String id) { - var list = baseMapper.t2_28(id); + public void t2_28(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_28(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1807,22 +1713,22 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i2_29(id); + public void i2_29(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_29(blStuMain); var imagePath = getStackHistogram(list); result.put("i2_29", imagePath); } //b2_8_1~5 - public void b2_8_1(WordOperator wo, Map result, String id) { - result.put("b2_8_1", getMapStr(baseMapper.b2_8_1(id))); - result.put("b2_8_2", getMapStr(baseMapper.b2_8_2(id))); - result.put("b2_8_3", getMapStr(baseMapper.b2_8_3(id))); - result.put("b2_8_4", getMapStr(baseMapper.b2_8_4(id))); - result.put("b2_8_5", getMapStr(baseMapper.b2_8_5(id))); + public void b2_8_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_8_1", getMapStr(baseMapper.b2_8_1(blStuMain))); + result.put("b2_8_2", getMapStr(baseMapper.b2_8_2(blStuMain))); + result.put("b2_8_3", getMapStr(baseMapper.b2_8_3(blStuMain))); + result.put("b2_8_4", getMapStr(baseMapper.b2_8_4(blStuMain))); + result.put("b2_8_5", getMapStr(baseMapper.b2_8_5(blStuMain))); } //图片i2_30 - public void i2_30(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_30(id); + public void i2_30(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_30(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart(list.get(0)); result.put("i2_30", imagePath); @@ -1830,8 +1736,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_31(id); + public void t2_31(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_31(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1846,8 +1752,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_32(id); + public void t2_32(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_32(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1862,24 +1768,24 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i2_33(id); + public void i2_33(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_33(blStuMain); var imagePath = getStackHistogram(list, true, "500", null, null); result.put("i2_33", imagePath); } //b2_9_1~7 - public void b2_9_1(WordOperator wo, Map result, String id) { - result.put("b2_9_1", getMapStr(baseMapper.b2_9_1(id))); - result.put("b2_9_2", getMapStr(baseMapper.b2_9_2(id))); - result.put("b2_9_3", getMapStr(baseMapper.b2_9_3(id))); - result.put("b2_9_4", getMapStr(baseMapper.b2_9_4(id))); - result.put("b2_9_5", getMapStr(baseMapper.b2_9_5(id))); - result.put("b2_9_6", getMapStr(baseMapper.b2_9_6(id))); - result.put("b2_9_7", getMapStr(baseMapper.b2_9_7(id))); + public void b2_9_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b2_9_1", getMapStr(baseMapper.b2_9_1(blStuMain))); + result.put("b2_9_2", getMapStr(baseMapper.b2_9_2(blStuMain))); + result.put("b2_9_3", getMapStr(baseMapper.b2_9_3(blStuMain))); + result.put("b2_9_4", getMapStr(baseMapper.b2_9_4(blStuMain))); + result.put("b2_9_5", getMapStr(baseMapper.b2_9_5(blStuMain))); + result.put("b2_9_6", getMapStr(baseMapper.b2_9_6(blStuMain))); + result.put("b2_9_7", getMapStr(baseMapper.b2_9_7(blStuMain))); } //图片i2_34 - public void i2_34(WordOperator wo, Map result, String id) { - var list = baseMapper.i2_34(id); + public void i2_34(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i2_34(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart100(list.get(0)); result.put("i2_34", imagePath); @@ -1887,8 +1793,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_35(id); + public void t2_35(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_35(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1903,8 +1809,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t2_36(id); + public void t2_36(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t2_36(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1921,21 +1827,21 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i3_1(id); + public void i3_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i3_1(blStuMain); var imagePath = getStackHistogram(list); result.put("i3_1", imagePath); } //b3_1_1~4 - public void b3_1_1(WordOperator wo, Map result, String id) { - result.put("b3_1_1", getMapStr(baseMapper.b3_1_1(id))); - result.put("b3_1_2", getMapStr(baseMapper.b3_1_2(id))); - result.put("b3_1_3", getMapStr(baseMapper.b3_1_3(id))); - result.put("b3_1_4", getMapStr(baseMapper.b3_1_4(id))); + public void b3_1_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b3_1_1", getMapStr(baseMapper.b3_1_1(blStuMain))); + result.put("b3_1_2", getMapStr(baseMapper.b3_1_2(blStuMain))); + result.put("b3_1_3", getMapStr(baseMapper.b3_1_3(blStuMain))); + result.put("b3_1_4", getMapStr(baseMapper.b3_1_4(blStuMain))); } //图片i3_2 - public void i3_2(WordOperator wo, Map result, String id) { - var list = baseMapper.i3_2(id); + public void i3_2(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i3_2(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart100(list.get(0)); result.put("i3_2", imagePath); @@ -1943,8 +1849,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t3_3(id); + public void t3_3(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t3_3(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1959,8 +1865,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t3_4(id); + public void t3_4(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t3_4(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -1974,33 +1880,33 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - result.put("b3_2_1", getMapStr(baseMapper.b3_2_1(id))); - result.put("b3_2_2", getMapStr(baseMapper.b3_2_2(id))); - result.put("b3_2_3", getMapStr(baseMapper.b3_2_3(id))); - result.put("b3_2_4", getMapStr(baseMapper.b3_2_4(id))); + public void b3_2_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b3_2_1", getMapStr(baseMapper.b3_2_1(blStuMain))); + result.put("b3_2_2", getMapStr(baseMapper.b3_2_2(blStuMain))); + result.put("b3_2_3", getMapStr(baseMapper.b3_2_3(blStuMain))); + result.put("b3_2_4", getMapStr(baseMapper.b3_2_4(blStuMain))); } //图片i3_5 - public void i3_5(WordOperator wo, Map result, String id) { - var list = baseMapper.i3_5(id); + public void i3_5(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i3_5(blStuMain); var imagePath = getStackHistogram(list); result.put("i3_5", imagePath); } //b3_2_5 - public void b3_2_5(WordOperator wo, Map result, String id) { - result.put("b3_2_5", getMapStr(baseMapper.b3_2_5(id))); + public void b3_2_5(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b3_2_5", getMapStr(baseMapper.b3_2_5(blStuMain))); } //图片i3_6 - public void i3_6(WordOperator wo, Map result, String id) { - var list = baseMapper.i3_6(id); + public void i3_6(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i3_6(blStuMain); var imagePath = getBaseHistogram(list); result.put("i3_6", imagePath); } //表格 t3_7 //大一 大二 大三 大四 - public void t3_7(WordOperator wo, Map result, String id) { - var list = baseMapper.t3_7(id); + public void t3_7(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t3_7(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2015,8 +1921,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t3_8(id); + public void t3_8(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t3_8(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2027,23 +1933,23 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i3_9(id); + public void i3_9(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i3_9(blStuMain); var imagePath = getStackHistogram(list); result.put("i3_9", imagePath); } //b3_3_1~5 - public void b3_3_1(WordOperator wo, Map result, String id) { - result.put("b3_3_1", getMapStr(baseMapper.b3_3_1(id))); - result.put("b3_3_2", getMapStr(baseMapper.b3_3_2(id))); - result.put("b3_3_3", getMapStr(baseMapper.b3_3_3(id))); - result.put("b3_3_4", getMapStr(baseMapper.b3_3_4(id))); - result.put("b3_3_5", getMapStr(baseMapper.b3_3_5(id))); + public void b3_3_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b3_3_1", getMapStr(baseMapper.b3_3_1(blStuMain))); + result.put("b3_3_2", getMapStr(baseMapper.b3_3_2(blStuMain))); + result.put("b3_3_3", getMapStr(baseMapper.b3_3_3(blStuMain))); + result.put("b3_3_4", getMapStr(baseMapper.b3_3_4(blStuMain))); + result.put("b3_3_5", getMapStr(baseMapper.b3_3_5(blStuMain))); } //图片i3_10 - public void i3_10(WordOperator wo, Map result, String id) { - var list = baseMapper.i3_10(id); + public void i3_10(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i3_10(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart(list.get(0)); result.put("i3_10", imagePath); @@ -2051,8 +1957,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t3_11(id); + public void t3_11(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t3_11(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2067,8 +1973,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t3_12(id); + public void t3_12(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t3_12(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2083,21 +1989,21 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i4_1(id); + public void i4_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i4_1(blStuMain); var imagePath = getStackHistogram(list); result.put("i4_1", imagePath); } //b4_1_1~4 - public void b4_1_1(WordOperator wo, Map result, String id) { - result.put("b4_1_1", getMapStr(baseMapper.b4_1_1(id))); - result.put("b4_1_2", getMapStr(baseMapper.b4_1_2(id))); - result.put("b4_1_3", getMapStr(baseMapper.b4_1_3(id))); - result.put("b4_1_4", getMapStr(baseMapper.b4_1_4(id))); + public void b4_1_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b4_1_1", getMapStr(baseMapper.b4_1_1(blStuMain))); + result.put("b4_1_2", getMapStr(baseMapper.b4_1_2(blStuMain))); + result.put("b4_1_3", getMapStr(baseMapper.b4_1_3(blStuMain))); + result.put("b4_1_4", getMapStr(baseMapper.b4_1_4(blStuMain))); } //图片i4_2 - public void i4_2(WordOperator wo, Map result, String id) { - var list = baseMapper.i4_2(id); + public void i4_2(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i4_2(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart(list.get(0)); result.put("i4_2", imagePath); @@ -2106,8 +2012,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t4_3(id); + public void t4_3(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t4_3(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2122,8 +2028,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t4_4(id); + public void t4_4(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t4_4(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2137,25 +2043,25 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - result.put("b4_2_1", getMapStr(baseMapper.b4_2_1(id))); - result.put("b4_2_2", getMapStr(baseMapper.b4_2_2(id))); - result.put("b4_2_3", getMapStr(baseMapper.b4_2_3(id))); - result.put("b4_2_4", getMapStr(baseMapper.b4_2_4(id))); - result.put("b4_2_5", getMapStr(baseMapper.b4_2_5(id))); - result.put("b4_2_6", getMapStr(baseMapper.b4_2_6(id))); + public void b4_2_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b4_2_1", getMapStr(baseMapper.b4_2_1(blStuMain))); + result.put("b4_2_2", getMapStr(baseMapper.b4_2_2(blStuMain))); + result.put("b4_2_3", getMapStr(baseMapper.b4_2_3(blStuMain))); + result.put("b4_2_4", getMapStr(baseMapper.b4_2_4(blStuMain))); + result.put("b4_2_5", getMapStr(baseMapper.b4_2_5(blStuMain))); + result.put("b4_2_6", getMapStr(baseMapper.b4_2_6(blStuMain))); } //图片i4_5 - public void i4_5(WordOperator wo, Map result, String id) { - var list = baseMapper.i4_5(id); + public void i4_5(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i4_5(blStuMain); var imagePath = getBaseTransverseHistogram(list); result.put("i4_5", imagePath); } //表格 t4_6 //学业指导各方面 大一 大二 大三 大四 - public void t4_6(WordOperator wo, Map result, String id) { - var list = baseMapper.t4_6(id); + public void t4_6(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t4_6(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2171,8 +2077,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t4_7(id); + public void t4_7(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t4_7(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2189,24 +2095,24 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i4_8(id); + public void i4_8(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i4_8(blStuMain); var imagePath = getStackHistogram(list); result.put("i4_8", imagePath); } //b4_3_1~5 - public void b4_3_1(WordOperator wo, Map result, String id) { - result.put("b4_3_1", getMapStr(baseMapper.b4_3_1(id))); - result.put("b4_3_2", getMapStr(baseMapper.b4_3_2(id))); - result.put("b4_3_3", getMapStr(baseMapper.b4_3_3(id))); - result.put("b4_3_4", getMapStr(baseMapper.b4_3_4(id))); - result.put("b4_3_5", getMapStr(baseMapper.b4_3_5(id))); + public void b4_3_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b4_3_1", getMapStr(baseMapper.b4_3_1(blStuMain))); + result.put("b4_3_2", getMapStr(baseMapper.b4_3_2(blStuMain))); + result.put("b4_3_3", getMapStr(baseMapper.b4_3_3(blStuMain))); + result.put("b4_3_4", getMapStr(baseMapper.b4_3_4(blStuMain))); + result.put("b4_3_5", getMapStr(baseMapper.b4_3_5(blStuMain))); } //图片i4_9 - public void i4_9(WordOperator wo, Map result, String id) { - var list = baseMapper.i4_9(id); + public void i4_9(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i4_9(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart100(list.get(0)); result.put("i4_9", imagePath); @@ -2215,8 +2121,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t4_10(id); + public void t4_10(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t4_10(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2232,8 +2138,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t4_11(id); + public void t4_11(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t4_11(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2249,25 +2155,25 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.i4_12(id); + public void i4_12(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i4_12(blStuMain); var imagePath = getStackHistogram(list); result.put("i4_12", imagePath); } //b4_4_1~6 - public void b4_4_1(WordOperator wo, Map result, String id) { - result.put("b4_4_1", getMapStr(baseMapper.b4_4_1(id))); - result.put("b4_4_2", getMapStr(baseMapper.b4_4_2(id))); - result.put("b4_4_3", getMapStr(baseMapper.b4_4_3(id))); - result.put("b4_4_4", getMapStr(baseMapper.b4_4_4(id))); - result.put("b4_4_5", getMapStr(baseMapper.b4_4_5(id))); - result.put("b4_4_6", getMapStr(baseMapper.b4_4_6(id))); + public void b4_4_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b4_4_1", getMapStr(baseMapper.b4_4_1(blStuMain))); + result.put("b4_4_2", getMapStr(baseMapper.b4_4_2(blStuMain))); + result.put("b4_4_3", getMapStr(baseMapper.b4_4_3(blStuMain))); + result.put("b4_4_4", getMapStr(baseMapper.b4_4_4(blStuMain))); + result.put("b4_4_5", getMapStr(baseMapper.b4_4_5(blStuMain))); + result.put("b4_4_6", getMapStr(baseMapper.b4_4_6(blStuMain))); } //图片i4_13 - public void i4_13(WordOperator wo, Map result, String id) { - var list = baseMapper.i4_13(id); + public void i4_13(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i4_13(blStuMain); if(list != null && !list.isEmpty()){ String imagePath = getRadarChart100(list.get(0)); result.put("i4_13", imagePath); @@ -2276,8 +2182,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t4_14(id); + public void t4_14(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t4_14(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2293,8 +2199,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t4_15(id); + public void t4_15(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t4_15(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2311,28 +2217,28 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - result.put("b5_1_1", getMapStr(baseMapper.b5_1_1(id))); - result.put("b5_1_2", getMapStr(baseMapper.b5_1_2(id))); - result.put("b5_1_3", getMapStr(baseMapper.b5_1_3(id))); - result.put("b5_1_4", getMapStr(baseMapper.b5_1_4(id))); + public void b5_1_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b5_1_1", getMapStr(baseMapper.b5_1_1(blStuMain))); + result.put("b5_1_2", getMapStr(baseMapper.b5_1_2(blStuMain))); + result.put("b5_1_3", getMapStr(baseMapper.b5_1_3(blStuMain))); + result.put("b5_1_4", getMapStr(baseMapper.b5_1_4(blStuMain))); } //图片i5_1 - public void i5_1(WordOperator wo, Map result, String id) { - var list = baseMapper.i5_1(id); + public void i5_1(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i5_1(blStuMain); var imagePath = getStackHistogram(list); result.put("i5_1", imagePath); } //b5_1_5 - public void b5_1_5(WordOperator wo, Map result, String id) { - result.put("b5_1_5", getMapStr(baseMapper.b5_1_5(id))); + public void b5_1_5(WordOperator wo, Map result, BlStuInfo blStuMain) { + result.put("b5_1_5", getMapStr(baseMapper.b5_1_5(blStuMain))); } //图片i5_2 - public void i5_2(WordOperator wo, Map result, String id) { - var list = baseMapper.i5_2(id); + public void i5_2(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.i5_2(blStuMain); if(list != null && !list.isEmpty()){ var json = """ { @@ -2357,15 +2263,17 @@ public class BlStuAnswerServiceImpl extends ServiceImpl runJs = Maps.newHashMap(); + runJs.put("runBefore","changeWH('400px','400px');");//自定宽高 + var imagePath = WebDriverUtil.getImgByteAuto(json, runJs); result.put("i5_2", imagePath); } } //表格 t5_3 // 大一 大二 大三 大四 - public void t5_3(WordOperator wo, Map result, String id) { - var list = baseMapper.t5_3(id); + public void t5_3(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t5_3(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); @@ -2381,8 +2289,8 @@ public class BlStuAnswerServiceImpl extends ServiceImpl result, String id) { - var list = baseMapper.t5_4(id); + public void t5_4(WordOperator wo, Map result, BlStuInfo blStuMain) { + var list = baseMapper.t5_4(blStuMain); List> table = Lists.newArrayList(); list.forEach(x -> { List col = Lists.newArrayList(); diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/WebDriverUtil.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/WebDriverUtil.java index 8ffd2f6..24289e0 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/WebDriverUtil.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/WebDriverUtil.java @@ -181,6 +181,13 @@ public class WebDriverUtil { return getImgByte(json, "echarts500.html"); } + /** + * 获取图片自定义高度 + */ + public static String getImgByteAuto(String json, Map runJs) { + return getImgByte(json, "echartsAuto.html", runJs); + } + /** * 保存图片 * diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/ExportWord.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/ExportWord.java index 62a5fe0..307098f 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/ExportWord.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/ExportWord.java @@ -3,6 +3,8 @@ package org.jeecg.modules.tools.word; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import com.google.common.collect.Lists; +import lombok.AllArgsConstructor; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.poi.ss.usermodel.Workbook; diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/TableMerge.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/TableMerge.java new file mode 100644 index 0000000..963ddf7 --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/TableMerge.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.tools.word; + +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @ClassName TableMerge + * @Description TODO + * @Author bai + * @Date 2024/7/23 下午8:45 + * @Version 1.0 + **/ +@Data +@AllArgsConstructor +public class TableMerge { + private int tableIndex; + private int col; + private int startRow; + private int endRow; +} diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/WordOperator.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/WordOperator.java index dedd4dd..40f0ed8 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/WordOperator.java +++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tools/word/WordOperator.java @@ -2,6 +2,8 @@ package org.jeecg.modules.tools.word; import cn.hutool.core.io.IoUtil; import com.google.common.collect.Lists; +import lombok.AllArgsConstructor; +import lombok.Data; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; @@ -12,10 +14,7 @@ import org.jeecg.modules.tools.CommonUtil; import org.jeecg.modules.tools.FileUtils; import org.jeecg.modules.tools.Global; import org.jeecg.modules.tools.IdGen; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTShd; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTc; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTcPr; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.STMerge; +import org.openxmlformats.schemas.wordprocessingml.x2006.main.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1183,17 +1182,26 @@ public class WordOperator { /** * 合并单元格 - * @param tableIndex 第几个表格 - * @param startRow 第几行开始 - * @param startCol 第几列开始 - * @param endRow 第几行结束 - * @param endCol 第几列结束 + * @param tableMerge * @return */ - public WordOperator addTableMerge(int tableIndex,int startRow,int startCol,int endRow,int endCol){ + public WordOperator addTableMerge(TableMerge tableMerge){ + addTableMerge(tableMerge.getTableIndex(), tableMerge.getCol(), tableMerge.getStartRow(), tableMerge.getEndRow()); + return this; + } + + /** + * 合并单元格 + * @param tableIndex 第几个表格,从0开始 + * @param col 第几列,从0开始 + * @param startRow 第几行开始,从0开始 + * @param endRow 第几行结束,从0开始 + * @return + */ + public WordOperator addTableMerge(int tableIndex,int col,int startRow,int endRow){ XWPFTable table = doc.getTables().get(tableIndex); if(table == null){ - logger.error("没有找到表格!tableIndex: [{}] startRow: [{}] startCol: [{}] endRow: [{}] endCol: [{}]",tableIndex,startRow,startCol,endRow,endCol); + logger.error("没有找到表格!tableIndex: [{}] col: [{}] startRow: [{}] endRow: [{}]",tableIndex,col,startRow,endRow); return this; } if(table.getRow(startRow) == null){ @@ -1201,25 +1209,54 @@ public class WordOperator { return this; } - if(table.getRow(startRow).getCell(startCol) == null){ - logger.error("没有找到表格!startCol: [{}]",startCol); - return this; - } - if(table.getRow(endRow) == null){ logger.error("没有找到表格!endRow: [{}]",endRow); return this; } + logger.info("第{}个表格,列{},开始行{},结束行{}",tableIndex, col, startRow, endRow); +// XWPFTableCell startCell = table.getRow(startRow).getCell(startCol); +// CTTcPr startTcPr = startCell.getCTTc().getTcPr(); +// if(startTcPr == null) { +// startTcPr = startCell.getCTTc().addNewTcPr(); +// } - if(table.getRow(endRow).getCell(endCol) == null){ - logger.error("没有找到表格!startRow: [{}]",endCol); - return this; - } - table.getRow(startRow).getCell(startCol).getCTTc().addNewTcPr().addNewHMerge().setVal(STMerge.RESTART);//开始 - table.getRow(endRow).getCell(endCol).getCTTc().addNewTcPr().addNewHMerge().setVal(STMerge.CONTINUE);//结尾 +// startTcPr.addNewVMerge().setVal(STMerge.RESTART); +// startTcPr.addNewHMerge().setVal(STMerge.RESTART); +// +// XWPFTableCell endCell = table.getRow(endRow).getCell(endCol); +// CTTcPr endTcPr = endCell.getCTTc().getTcPr(); +// if(endTcPr == null) { +// endTcPr = endCell.getCTTc().addNewTcPr(); +// } +// +// endTcPr.addNewVMerge().setVal(STMerge.CONTINUE); +// endTcPr.addNewHMerge().setVal(STMerge.CONTINUE); + + mergeCellsVertically(table, col, startRow,endRow); + //table.getRow(startRow).getCell(startCol).getCTTc().addNewTcPr().addNewHMerge().setVal(STMerge.RESTART);//开始 + //table.getRow(endRow).getCell(endCol).getCTTc().addNewTcPr().addNewHMerge().setVal(STMerge.CONTINUE);//结尾 return this; } + public static void mergeCellsVertically(XWPFTable table, int col, int fromRow, int toRow) { + if (toRow > fromRow) { + for(int rowIndex = fromRow; rowIndex <= toRow; ++rowIndex) { + XWPFTableCell cell = table.getRow(rowIndex).getCell(col); + CTTcPr tcPr = cell.getCTTc().getTcPr(); + if(tcPr == null) { + tcPr = cell.getCTTc().addNewTcPr(); + } + CTVMerge vMerge = tcPr.addNewVMerge(); + if (rowIndex == fromRow) { + vMerge.setVal(STMerge.RESTART); + } else { + vMerge.setVal(STMerge.CONTINUE); + } + } + + } + } + /** * * 功能说明 : 文档再次替换时使用,因为之前已经替换一次了,所有需要将文档片段存入内存流中,在读取到文档类里,才能替换成功 diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/officetemplates/exp1/student-tjfx.docx b/jeecg-boot/jeecg-module-demo/src/main/resources/officetemplates/exp1/student-tjfx.docx index ea9eda6..d1da6df 100644 --- a/jeecg-boot/jeecg-module-demo/src/main/resources/officetemplates/exp1/student-tjfx.docx +++ b/jeecg-boot/jeecg-module-demo/src/main/resources/officetemplates/exp1/student-tjfx.docx @@ -319,7 +319,7 @@ Z 专业课"两性一度" 专业课"两性一度"评价:指学生对专业课程的"高阶性"、"创新性"、"挑战度"的评价。 学生对于专业课"两性一度"各方面的评价各项占比详见下图。 - + 专业课"两性一度"评价各项占比 在落实课堂教学改革、提高课程两性一度方面,该校学生对专业课程的评价如下:高阶性方面,"课程将知识、能力、素养进行了有机融合"的符合程度得分为{b2_2_1}分,"课程教学培养了我解决复杂问题的综合能力"的符合程度得分为{b2_2_2}分;创新性方面,"课程内容注重学科间的交叉与融合"的符合程度得分为{b2_2_3}分,"课程内容反映了学科发展的前沿内容"的符合程度得分为{b2_2_4}分,"课程教学内容重视实践与理论的结合"的符合程度得分为{b2_2_5}分;挑战度方面,"需要非常努力才能达到课程要求"的符合程度得分为{b2_2_6}分。 @@ -925,7 +925,7 @@ Z 总体满意度评价各项占比 在总体满意度方面,该校学生对本校的总体满意度为{b5_1_5}%。 - + 总体满意度 注:图表中数值为计算所得平均分数。 diff --git a/jeecg-boot/jeecg-module-demo/src/main/resources/web/html/echartsAuto.html b/jeecg-boot/jeecg-module-demo/src/main/resources/web/html/echartsAuto.html new file mode 100644 index 0000000..4a171ca --- /dev/null +++ b/jeecg-boot/jeecg-module-demo/src/main/resources/web/html/echartsAuto.html @@ -0,0 +1,52 @@ + + + + + + + + + +
+ + + + +