2024年7月24日 新增动态宽高html模板，新增合并行，修复部分图表问题，修复列表筛选
This commit is contained in:
parent
f70d343310
commit
16274aef85
|
|
@ -226,7 +226,7 @@ public class BlStuAnswerController extends JeecgController<BlStuAnswer, IBlStuAn
|
|||
|
||||
@ApiOperation(value="生成教师问卷报表", notes="生成教师问卷报表")
|
||||
@GetMapping(value = "/createWord")
|
||||
public Result<String> createWord(@RequestParam(name="id",required=true) String id) throws Exception {
|
||||
public Result<String> 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<BlStuAnswer, IBlStuAn
|
|||
updateWp.lambda().set(BlStuInfo::getFilePath,exportWordPath);
|
||||
blStuInfoService.update(updateWp);
|
||||
log.info("更新后的文档地址： {}", exportWordPath);
|
||||
//根据配置决定是否删除子表数据
|
||||
if(isDelChildren){
|
||||
//
|
||||
log.error("hahaha删除了！");
|
||||
} else {
|
||||
log.error("hahaha灭有删除了！");
|
||||
}
|
||||
|
||||
return Result.OK("生成成功");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
|
|||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.MapKey;
|
||||
import org.jeecg.modules.demo.blStuAnswer.entity.BlStuAnswer;
|
||||
import org.jeecg.modules.demo.blStuInfo.entity.BlStuInfo;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
|
@ -21,570 +22,570 @@ public interface BlStuAnswerMapper extends BaseMapper<BlStuAnswer> {
|
|||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_1_1(String id);
|
||||
List<Map<String, String>> t1_1_1(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_1_2(String id);
|
||||
List<Map<String, String>> t1_1_2(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_1_3(String id);
|
||||
List<Map<String, String>> t1_1_3(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> viewBlMajorStatic(String id);
|
||||
List<Map<String, String>> viewBlMajorStatic(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> viewBlMajorStatic2(String id);
|
||||
List<Map<String, String>> viewBlMajorStatic2(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i1_1(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i1_2(String id);
|
||||
List<Map<String, String>> i1_2(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_3(String id);
|
||||
List<Map<String, String>> t1_3(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_4(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> t1_5(String id);
|
||||
List<Map<String, String>> t1_5(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_6(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> t1_7(String id);
|
||||
List<Map<String, String>> t1_7(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_8(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i1_9(String id);
|
||||
List<Map<String, String>> i1_9(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_10(String id);
|
||||
List<Map<String, String>> t1_10(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_11(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i1_12(String id);
|
||||
List<Map<String, String>> i1_12(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i1_13(String id);
|
||||
List<Map<String, String>> i1_13(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t1_14(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_1(String id);
|
||||
List<Map<String, String>> i2_1(BlStuInfo blStuMain);
|
||||
|
||||
String b2_1_5(String id);
|
||||
String b2_1_5(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_2(String id);
|
||||
List<Map<String, String>> i2_2(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_3(String id);
|
||||
List<Map<String, String>> t2_3(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_4(String id);
|
||||
List<Map<String, String>> t2_4(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_5(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_6(String id);
|
||||
List<Map<String, String>> i2_6(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_7(String id);
|
||||
List<Map<String, String>> t2_7(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_8(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_9(String id);
|
||||
List<Map<String, String>> i2_9(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_10(String id);
|
||||
List<Map<String, String>> t2_10(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_11(String id);
|
||||
List<Map<String, String>> t2_11(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_12(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_13(String id);
|
||||
List<Map<String, String>> i2_13(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_14(String id);
|
||||
List<Map<String, String>> t2_14(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_15(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_16(String id);
|
||||
List<Map<String, String>> i2_16(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_17(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_18(String id);
|
||||
List<Map<String, String>> i2_18(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_19(String id);
|
||||
List<Map<String, String>> t2_19(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_20(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_21(String id);
|
||||
List<Map<String, String>> i2_21(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_22(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_23(String id);
|
||||
List<Map<String, String>> i2_23(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_24(String id);
|
||||
List<Map<String, String>> t2_24(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_25(String id);
|
||||
List<Map<String, String>> t2_25(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_26(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_27(String id);
|
||||
List<Map<String, String>> i2_27(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_28(String id);
|
||||
List<Map<String, String>> t2_28(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_29(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_30(String id);
|
||||
List<Map<String, String>> i2_30(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_31(String id);
|
||||
List<Map<String, String>> t2_31(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_32(String id);
|
||||
List<Map<String, String>> t2_32(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i2_33(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i2_34(String id);
|
||||
List<Map<String, String>> i2_34(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_35(String id);
|
||||
List<Map<String, String>> t2_35(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t2_36(String id);
|
||||
List<Map<String, String>> t2_36(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i3_1(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i3_2(String id);
|
||||
List<Map<String, String>> i3_2(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_3(String id);
|
||||
List<Map<String, String>> t3_3(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_4(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i3_5(String id);
|
||||
List<Map<String, String>> i3_5(BlStuInfo blStuMain);
|
||||
|
||||
String b3_2_5(String id);
|
||||
String b3_2_5(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i3_6(String id);
|
||||
List<Map<String, String>> i3_6(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_7(String id);
|
||||
List<Map<String, String>> t3_7(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_8(String id);
|
||||
List<Map<String, String>> t3_8(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i3_9(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i3_10(String id);
|
||||
List<Map<String, String>> i3_10(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_11(String id);
|
||||
List<Map<String, String>> t3_11(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t3_12(String id);
|
||||
List<Map<String, String>> t3_12(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i4_1(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i4_2(String id);
|
||||
List<Map<String, String>> i4_2(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_3(String id);
|
||||
List<Map<String, String>> t4_3(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_4(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i4_5(String id);
|
||||
List<Map<String, String>> i4_5(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_6(String id);
|
||||
List<Map<String, String>> t4_6(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_7(String id);
|
||||
List<Map<String, String>> t4_7(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i4_8(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i4_9(String id);
|
||||
List<Map<String, String>> i4_9(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_10(String id);
|
||||
List<Map<String, String>> t4_10(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_11(String id);
|
||||
List<Map<String, String>> t4_11(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i4_12(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i4_13(String id);
|
||||
List<Map<String, String>> i4_13(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_14(String id);
|
||||
List<Map<String, String>> t4_14(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t4_15(String id);
|
||||
List<Map<String, String>> 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<Map<String, String>> i5_1(String id);
|
||||
List<Map<String, String>> i5_1(BlStuInfo blStuMain);
|
||||
|
||||
String b5_1_5(String id);
|
||||
String b5_1_5(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> i5_2(String id);
|
||||
List<Map<String, String>> i5_2(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t5_3(String id);
|
||||
List<Map<String, String>> t5_3(BlStuInfo blStuMain);
|
||||
|
||||
@InterceptorIgnore(tenantLine = "true")
|
||||
@MapKey("key")
|
||||
List<Map<String, String>> t5_4(String id);
|
||||
List<Map<String, String>> t5_4(BlStuInfo blStuMain);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
<select id="b1_1_1" resultType="String">
|
||||
|
|
@ -166,7 +166,11 @@
|
|||
round(sum(IN_CLASS_QUESTIONS2)/count('x'),2) as '02',
|
||||
round(sum(AFTER_CLASS_SUMMARY2)/count('x'),2) as '03',
|
||||
round(sum(AFTER_CLASS_READ2)/count('x'),2) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="b1_2_1" resultType="String">
|
||||
|
|
@ -226,7 +230,9 @@
|
|||
round(sum(STUDYTIME_SELF)/count('x')) as '02',
|
||||
round(sum(STUDYTIME_READ)/count('x')) as '03',
|
||||
round(sum(STUDYTIME_ONLINE)/count('x')) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="b1_2_5" resultType="String">
|
||||
|
|
@ -286,7 +292,9 @@
|
|||
round(sum(STUDYTIME_SOCIETY)/count('x')) as '02',
|
||||
round(sum(STUDYTIME_COMPETITION)/count('x')) as '03',
|
||||
round(sum(STUDYTIME_OTHER)/count('x')) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="b1_3_1" resultType="String">
|
||||
|
|
@ -388,7 +396,9 @@
|
|||
round(round(sum(INTERACT_RESEARCH1)/count('x'),2)*100) as '02',
|
||||
round(round(sum(INTERACT_COMPETITION1)/count('x'),2)*100) as '03',
|
||||
round(round(sum(INTERACT_RESEARCH1)/count('x'),2)*100) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="b1_4_1" resultType="String">
|
||||
|
|
@ -460,18 +470,17 @@
|
|||
<select id="t1_14" resultType="java.util.LinkedHashMap">
|
||||
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>
|
||||
|
||||
<select id="b2_1_1" resultType="String">
|
||||
|
|
@ -534,7 +543,9 @@
|
|||
select
|
||||
major as 'key',
|
||||
round(sum(SXZZK_SATI2)/count(*)) as '01'
|
||||
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>
|
||||
|
||||
<select id="i2_5" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -740,7 +751,7 @@
|
|||
</select>
|
||||
|
||||
<select id="b2_2_6" resultType="String">
|
||||
select round(sum(ZYK_EFFORT2)/count('x'),2) from bl_stu_answer where main_id = #{id};
|
||||
select round(sum(ZYK_EFFORT2)/count('x'),2) from bl_stu_answer where main_id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="i2_9" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -802,7 +813,11 @@
|
|||
round(sum(ZYK_ADVANCED2)/count('x'),2) as '04',
|
||||
round(sum(ZYK_INTERN2)/count('x'),2) as '05',
|
||||
round(sum(ZYK_EFFORT2)/count('x'),2) as '06'
|
||||
from bl_stu_answer GROUP BY major order by 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>
|
||||
|
||||
<select id="i2_12" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -922,7 +937,10 @@
|
|||
round(sum(METHOD_HUDONG2)/count('x'),2) as '02',
|
||||
round(sum(METHOD_ANLI2)/count('x'),2) as '03',
|
||||
round(sum(METHOD_XIANGMU2)/count('x'),2) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="b2_4_1" resultType="String">
|
||||
|
|
@ -1060,7 +1078,10 @@
|
|||
round(sum(EDUSATI_TI2)/count('x')) as '01',
|
||||
round(sum(EDUSATI_MEI2)/count('x')) as '02',
|
||||
round(sum(EDUSATI_LAO2)/count('x')) as '03'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="b2_6_1" resultType="String">
|
||||
|
|
@ -1220,11 +1241,11 @@
|
|||
|
||||
<select id="t2_25" resultType="java.util.LinkedHashMap">
|
||||
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>
|
||||
|
||||
<select id="i2_33" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -1662,7 +1686,10 @@
|
|||
round(sum(SUYANG_ZEREN2)/count('x')) as '05',
|
||||
round(sum(SUYANG_SHIJIAN2)/count('x')) as '06',
|
||||
round(sum(SUYANG_TISHENG2)/count('x')) as '07'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="i3_1" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -1781,7 +1808,10 @@
|
|||
round(sum(TEACHERSATI_INPUT2)/count('x')) as '02',
|
||||
round(sum(TEACHERSATI_LAW2)/count('x')) as '03',
|
||||
round(sum(TEACHERSATI_CARE2)/count('x')) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="b3_2_1" resultType="String">
|
||||
|
|
@ -1798,7 +1828,7 @@
|
|||
|
||||
<select id="b3_2_3" resultType="String">
|
||||
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
|
||||
</select>
|
||||
|
||||
|
|
@ -1840,7 +1870,10 @@
|
|||
</select>
|
||||
|
||||
<select id="t3_8" resultType="java.util.LinkedHashMap">
|
||||
select major as 'key',round(sum(TEACHERSATI_ZONGTI2)/count(*))as '01' from bl_stu_answer where main_id = #{id} GROUP BY MAJOR order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
select major as 'key',round(sum(TEACHERSATI_ZONGTI2)/count(*))as '01' 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>
|
||||
|
||||
<select id="i3_9" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -1938,7 +1971,7 @@
|
|||
round(sum(TEACHER_METHOD2)/count('x'),2) as '教学方法灵活多样，引导学生进行创造性思考',
|
||||
round(sum(TEACHER_INTEREST2)/count('x'),2) as '课堂上激发学生的学习兴趣',
|
||||
round(sum(TEACHER_AFTER2)/count('x'),2) as '课后为学生提供辅导答疑'
|
||||
from bl_stu_answer where main_id = #{id};
|
||||
from bl_stu_answer where main_id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="t3_11" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -1980,7 +2013,10 @@
|
|||
round(sum(TEACHER_METHOD2)/count('x'),2) as '03',
|
||||
round(sum(TEACHER_INTEREST2)/count('x'),2) as '04',
|
||||
round(sum(TEACHER_AFTER2)/count('x'),2) as '05'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="i4_1" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -2095,7 +2131,10 @@
|
|||
round(sum(STUDENTCENTER_EXPERIMENT2)/count('x'),2) as '02',
|
||||
round(sum(STUDENTCENTER_ACTIVITY2)/count('x'),2) as '03',
|
||||
round(sum(STUDENTCENTER_LECTURE2)/count('x'),2) as '04'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="b4_2_1" resultType="String">
|
||||
|
|
@ -2182,7 +2221,10 @@
|
|||
round(round(sum(XYZD_DAOSHI)/count('x'),2)*100) as '04',
|
||||
round(round(sum(XYZD_FDY)/count('x'),2)*100) as '05',
|
||||
round(round(sum(XYZD_NO)/count('x'),2)*100) as '06'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="i4_8" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -2322,7 +2364,10 @@
|
|||
round(sum(STUSATI_FDY2)/count('x')) as '03',
|
||||
round(sum(STUSATI_XYZD2)/count('x')) as '04',
|
||||
round(sum(STUSATI_ZZ2)/count('x')) as '05'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="i4_12" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -2487,7 +2532,10 @@
|
|||
round(sum(CAMPUS_INTERNET2)/count('x')) as '04',
|
||||
round(sum(CAMPUS_SPORT2)/count('x')) as '05',
|
||||
round(sum(CAMPUS_RESIDENCE2)/count('x')) as '06'
|
||||
from bl_stu_answer where main_id = #{id} GROUP BY major order by 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>
|
||||
|
||||
<select id="b5_1_1" resultType="String">
|
||||
|
|
@ -2546,7 +2594,10 @@
|
|||
</select>
|
||||
|
||||
<select id="t5_4" resultType="java.util.LinkedHashMap">
|
||||
select major as 'key',round(sum(SATI_ZONGTI2)/count(*)) as '01' from bl_stu_answer where main_id = #{id} GROUP BY MAJOR order by CONVERT(major USING gbk) COLLATE gbk_chinese_ci
|
||||
select major as 'key',round(sum(SATI_ZONGTI2)/count(*)) as '01' 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>
|
||||
|
||||
</mapper>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -181,6 +181,13 @@ public class WebDriverUtil {
|
|||
return getImgByte(json, "echarts500.html");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取图片自定义高度
|
||||
*/
|
||||
public static String getImgByteAuto(String json, Map<String, String> runJs) {
|
||||
return getImgByte(json, "echartsAuto.html", runJs);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存图片
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* 功能说明 : 文档再次替换时使用，因为之前已经替换一次了，所有需要将文档片段存入内存流中，在读取到文档类里，才能替换成功
|
||||
|
|
|
|||
|
|
@ -319,7 +319,7 @@ Z
|
|||
专业课"两性一度"
|
||||
专业课"两性一度"评价：指学生对专业课程的"高阶性"、"创新性"、"挑战度"的评价。
|
||||
学生对于专业课"两性一度"各方面的评价各项占比详见下图。
|
||||
<i2_8,400,170>
|
||||
<i2_8,400,200>
|
||||
专业课"两性一度"评价各项占比
|
||||
|
||||
在落实课堂教学改革、提高课程两性一度方面，该校学生对专业课程的评价如下：高阶性方面，"课程将知识、能力、素养进行了有机融合"的符合程度得分为{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}%。
|
||||
<i5_2,400,170>
|
||||
<i5_2,150,150>
|
||||
总体满意度
|
||||
|
||||
注：图表中数值为计算所得平均分数。
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
<html>
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<head>
|
||||
<script src="http://gssn.fw121.com/js/jquery-3.2.1.min.js"></script>
|
||||
<script src="./echarts.min.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<!-- 为 ECharts 准备一个具备大小（宽高）的 DOM -->
|
||||
<div id="rhEcharts" style="height:400px;width:1050px"></div>
|
||||
</body>
|
||||
<script>
|
||||
var rhEcharts = null;
|
||||
$(function () {
|
||||
// 基于准备好的dom，初始化echarts实例
|
||||
rhEcharts = echarts.init(document.getElementById('rhEcharts'));
|
||||
});
|
||||
function showImg(data) {
|
||||
// var option = {
|
||||
// xAxis: {
|
||||
// type: 'category',
|
||||
// data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
|
||||
// },
|
||||
// yAxis: {
|
||||
// type: 'value'
|
||||
// },
|
||||
// series: [{
|
||||
// data: [820, 932, 901, 934, 1290, 1330, 1320],
|
||||
// type: 'line'
|
||||
// }]
|
||||
// };
|
||||
// rhEcharts.setOption(option);
|
||||
rhEcharts.setOption(data);
|
||||
}
|
||||
|
||||
function returnEchartImg() {
|
||||
var url = rhEcharts.getDataURL();
|
||||
//清空绘画内容，清空后实例可用
|
||||
rhEcharts.clear();
|
||||
return url;
|
||||
}
|
||||
|
||||
function changeWH(width,height) {
|
||||
rhEcharts.dispose()
|
||||
document.querySelector('#rhEcharts').style.width = width;
|
||||
document.querySelector('#rhEcharts').style.height = height;
|
||||
rhEcharts = echarts.init(document.getElementById('rhEcharts'));
|
||||
}
|
||||
</script>
|
||||
</html>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue