2024年7月11日 修复问题
This commit is contained in:
parent
7ab8eb11a0
commit
6b4cae0232
|
|
@ -944,17 +944,17 @@
|
|||
</select>
|
||||
|
||||
<select id="i2_16" resultType="java.util.LinkedHashMap">
|
||||
select '卷面考试' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_JUANMIAN = #{id})b
|
||||
select '卷面考试' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_JUANMIAN = '1')b
|
||||
union all
|
||||
select '随堂提问或测试' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_TIWEN = #{id})b
|
||||
select '随堂提问或测试' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_TIWEN = '1')b
|
||||
union all
|
||||
select '小组合作完成的课程作业' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_XIAOZU = #{id})b
|
||||
select '小组合作完成的课程作业' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_XIAOZU = '1')b
|
||||
union all
|
||||
select '课堂展示' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_ZHANSHI = #{id})b
|
||||
select '课堂展示' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_ZHANSHI = '1')b
|
||||
union all
|
||||
select '个人独立完成的课程作业' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_GEREN = #{id})b
|
||||
select '个人独立完成的课程作业' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_GEREN = '1')b
|
||||
union all
|
||||
select '过课程论文或实验报告' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_LUNWEN = #{id})b
|
||||
select '过课程论文或实验报告' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and EVALUATE_LUNWEN = '1')b
|
||||
</select>
|
||||
|
||||
<select id="i2_17" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -2116,17 +2116,17 @@
|
|||
</select>
|
||||
|
||||
<select id="i4_5" resultType="java.util.LinkedHashMap">
|
||||
select '学校或学院提供的辅导课程或相关活动' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_KECHENG = #{id})b
|
||||
select '学校或学院提供的辅导课程或相关活动' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_KECHENG = '1')b
|
||||
union all
|
||||
select '任课教师帮助解决相关问题' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_JIAOSHI = #{id})b
|
||||
select '任课教师帮助解决相关问题' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_JIAOSHI = '1')b
|
||||
union all
|
||||
select '学业指导网站相关服务' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_WANGZHAN = #{id})b
|
||||
select '学业指导网站相关服务' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_WANGZHAN = '1')b
|
||||
union all
|
||||
select '辅导员帮助解决相关问题' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_FDY = #{id})b
|
||||
select '辅导员帮助解决相关问题' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_FDY = '1')b
|
||||
union all
|
||||
select '本科生导师帮助解决相关问题' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_DAOSHI = #{id})b
|
||||
select '本科生导师帮助解决相关问题' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_DAOSHI = '1')b
|
||||
union all
|
||||
select '没有接受过本校提供的学业指导服务' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_NO = #{id})b
|
||||
select '没有接受过本校提供的学业指导服务' as 'key' ,round(round(b.no_cnt/a.tot_cnt,2)*100) as '01' from (select count('x') as tot_cnt from bl_stu_answer where main_id = #{id})a,(select count('x') as no_cnt from bl_stu_answer where main_id = #{id} and XYZD_NO = '1')b
|
||||
</select>
|
||||
|
||||
<select id="t4_6" resultType="java.util.LinkedHashMap">
|
||||
|
|
@ -2476,7 +2476,7 @@
|
|||
select major as 'key',
|
||||
round(sum(CAMPUS_EQUIPMENT2)/count('x')) as '01',
|
||||
round(sum(CAMPUS_LAB2)/count('x')) as '02',
|
||||
round(sum(CAMPUS_BOOK2)/count('x')) as '02',
|
||||
round(sum(CAMPUS_BOOK2)/count('x')) as '03',
|
||||
round(sum(CAMPUS_INTERNET2)/count('x')) as '04',
|
||||
round(sum(CAMPUS_SPORT2)/count('x')) as '05',
|
||||
round(sum(CAMPUS_RESIDENCE2)/count('x')) as '06'
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ import org.jeecg.modules.tools.word.WordOperator;
|
|||
*/
|
||||
public interface IBlStuAnswerService extends IService<BlStuAnswer> {
|
||||
|
||||
WordOperator createWordTjfx(String id) throws Exception;
|
||||
WordOperator createWordTjfx(String id);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.CompletionService;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
|
@ -58,7 +59,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
static final String K07 = "07";
|
||||
|
||||
@Override
|
||||
public WordOperator createWordTjfx(String id) throws Exception {
|
||||
public WordOperator createWordTjfx(String id) {
|
||||
return createWordTjfxA(id);
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +87,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
log.info("多线程主线程开始执行");
|
||||
//多线程执行
|
||||
CompletionService<Boolean> threadService = ThreadUtil.newCompletionService(Executors.newFixedThreadPool(100));
|
||||
List<Callable<Boolean>> calls = com.google.common.collect.Lists.newArrayList();
|
||||
List<Callable<Boolean>> calls = Lists.newArrayList();
|
||||
calls.add(() -> {
|
||||
t1_1(wo, result, id);
|
||||
return true;
|
||||
|
|
@ -527,9 +528,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
calls.forEach(threadService::submit);
|
||||
calls.forEach(fn -> {
|
||||
try {
|
||||
threadService.take();
|
||||
} catch (InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
var res = threadService.take().get();
|
||||
log.info("进程返回值: {}", res);
|
||||
} catch (InterruptedException | ExecutionException e) {
|
||||
log.error(e.getMessage(), e);
|
||||
}
|
||||
});
|
||||
log.info("多线程主线程结束执行");
|
||||
|
|
@ -616,7 +618,9 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
data: %s
|
||||
},
|
||||
yAxis: { type: 'value' },
|
||||
series: [ { label: { show: true, color: 'blue', position: 'top' }, type: 'bar', data: %s } ]
|
||||
axisLabel: { color:'#000', fontSize: 20 },
|
||||
barWidth: '25%%',
|
||||
series: [ { label: { show: true, color: '#000', position: 'top' }, type: 'bar', data: %s } ]
|
||||
}
|
||||
""";
|
||||
json = json.formatted(JSONUtil.toJsonStr(xAxisData), JSONUtil.toJsonStr(yAxisData));
|
||||
|
|
@ -638,7 +642,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
* @return
|
||||
*/
|
||||
public String getStackHistogram(List<Map<String, String>> list) {
|
||||
return getStackHistogram(list, true);
|
||||
return getStackHistogram(list, true, null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -646,7 +650,16 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
* @param list
|
||||
* @return
|
||||
*/
|
||||
public String getStackHistogram(List<Map<String, String>> list, boolean isAutoCompletionPercentage ) {
|
||||
public String getStackHistogram(List<Map<String, String>> list, boolean isAutoCompletionPercentage) {
|
||||
return getStackHistogram(list, isAutoCompletionPercentage, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 堆叠横向柱状图
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
public String getStackHistogram(List<Map<String, String>> list, boolean isAutoCompletionPercentage, String height) {
|
||||
var colorList = List.of("#0f447f","#2350a0", "#008ac8", "#57b8e7", "#beedf8");
|
||||
AtomicInteger i = new AtomicInteger(0);
|
||||
Function<AtomicInteger, String> getColor = _i -> {
|
||||
|
|
@ -760,7 +773,10 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
seriesList.forEach(seriesListSb::append);
|
||||
seriesListSb.append("]");
|
||||
json = json.formatted(yAxisDataSb.toString(), seriesListSb.toString());
|
||||
return WebDriverUtil.getImgByte400(json);
|
||||
if(height == null) {
|
||||
height = "400";
|
||||
}
|
||||
return WebDriverUtil.getImgByte(json, "echarts" + height + ".html");//echarts500.html
|
||||
}
|
||||
|
||||
public String getRadarChart100(Map<String, String> map){
|
||||
|
|
@ -1653,7 +1669,7 @@ public class BlStuAnswerServiceImpl extends ServiceImpl<BlStuAnswerMapper, BlStu
|
|||
//图片i2_33
|
||||
public void i2_33(WordOperator wo, Map<String, Object> result, String id) {
|
||||
var list = baseMapper.i2_33(id);
|
||||
var imagePath = getStackHistogram(list);
|
||||
var imagePath = getStackHistogram(list, true, "500");
|
||||
result.put("i2_33", imagePath);
|
||||
}
|
||||
//b2_9_1~7
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package org.jeecg.modules.demo.blTeacherAnswer.service.impl;
|
|||
|
||||
import cn.hutool.core.thread.ThreadUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
|
@ -14,17 +15,14 @@ import org.jeecg.modules.demo.blTeacherInfo.mapper.BlTeacherInfoMapper;
|
|||
import org.jeecg.modules.tools.WebDriverUtil;
|
||||
import org.jeecg.modules.tools.word.ExportWord;
|
||||
import org.jeecg.modules.tools.word.WordOperator;
|
||||
import org.jfree.data.category.DefaultCategoryDataset;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Random;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.CompletionService;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
/**
|
||||
|
|
@ -442,9 +440,10 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
|
|||
calls.forEach(threadService::submit);
|
||||
calls.forEach(fn -> {
|
||||
try {
|
||||
threadService.take();
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage(),e);
|
||||
var res = threadService.take().get();
|
||||
log.info("进程返回值: {}", res);
|
||||
} catch (InterruptedException | ExecutionException e) {
|
||||
log.error(e.getMessage(), e);
|
||||
}
|
||||
});
|
||||
log.info("多线程主线程结束执行");
|
||||
|
|
|
|||
|
|
@ -903,7 +903,7 @@ Z
|
|||
核心素养
|
||||
核心素养满意度：指学生对自我核心素养提升方面的评价。其中核心素养主要包括人文底蕴（人文积淀、人文情怀、审美情趣等）、科学精神（理性思维、批判质疑、勇于探究等）、学会学习（乐学善学、勤于反思、信息意识等）、健康生活（珍爱生命、健全人格、自我管理等）、责任担当（社会责任、国家认同、国际理解等）、实践创新（劳动意识、问题解决、技术应用等）和自我提升（变得自信、善于交友、学会包容等）等方面。
|
||||
学生对于自我核心素养提升各方面的评价各项占比详见下图。
|
||||
<i2_33,400,170>
|
||||
<i2_33,400,200>
|
||||
核心素养满意度评价各项占比
|
||||
|
||||
在自我核心素养提升方面，该校学生对"人文底蕴"的满意度为{b2_9_1}%，"科学精神"的满意度为{b2_9_2}%，"学会学习"的满意度为{b2_9_3}%，"健康生活"的满意度为{b2_9_4}%，"责任担当"的满意度为{b2_9_5}%，"实践创新"的满意度为{b2_9_6}%，"自我提升"的满意度为{b2_9_7}%。
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ spring:
|
|||
clean-disabled: true
|
||||
servlet:
|
||||
multipart:
|
||||
max-file-size: 10MB
|
||||
max-request-size: 10MB
|
||||
max-file-size: 100MB
|
||||
max-request-size: 100MB
|
||||
mail:
|
||||
host: smtp.163.com
|
||||
username: jeecgos@163.com
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ spring:
|
|||
clean-disabled: true
|
||||
servlet:
|
||||
multipart:
|
||||
max-file-size: 10MB
|
||||
max-request-size: 10MB
|
||||
max-file-size: 100MB
|
||||
max-request-size: 100MB
|
||||
mail:
|
||||
host: smtp.163.com
|
||||
username: jeecgos@163.com
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ spring:
|
|||
clean-disabled: true
|
||||
servlet:
|
||||
multipart:
|
||||
max-file-size: 10MB
|
||||
max-request-size: 10MB
|
||||
max-file-size: 100MB
|
||||
max-request-size: 100MB
|
||||
mail:
|
||||
host: smtp.163.com
|
||||
username: ??
|
||||
|
|
|
|||
Loading…
Reference in New Issue