yangjun
/
dbsd_tjbbfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2024年9月24日 修复问题

This commit is contained in:
bai 2024-09-24 00:09:25 +08:00
parent a98af1b1fe
commit abd45dacf5
3 changed files with 336 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

614
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/mapper/xml/BlTeacherAnswerMapper.xml
View File

File diff suppressed because it is too large Load Diff

48
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/service/impl/BlTeacherAnswerServiceImpl.java
View File

@ -1162,7 +1162,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
//岗位类型结构
List<BlTeacherAnswer> gwlxjgList = baseMapper.getSelectGwlxjg(blTeacherMain);
for (BlTeacherAnswer par:gwlxjgList){
if(StringUtils.equals(par.getPositiontype(),"教学科研型")){
if(StringUtils.equals(par.getPositiontype(),"科研型")){
result.put("gwlxjg1", par.getCnt());//数量
result.put("gwlxjg1_zb", par.getNum());//占比
}else if(StringUtils.equals(par.getPositiontype(),"教学型")){
@ -1273,7 +1273,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
Integer num3 = 0;
Integer num4 = 0;
for(BlTeacherAnswer par:xxztmyd3List){
if(StringUtils.equals(par.getLsname(),"教学科研型")){
if(StringUtils.equals(par.getLsname(),"科研型")){
num1 = (int)Double.parseDouble(par.getTj1());
}else if(StringUtils.equals(par.getLsname(),"教学型")){
num2 = (int)Double.parseDouble(par.getTj1());
@ -1289,7 +1289,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
" ['对学校整体的满意度', "+num1+", "+num2+", "+num3+", "+num4+"], \n" +
" ]},xAxis: { type: 'category' },yAxis: {}, \n" +
" series: [\n" +
" {name:'教学科研型',type: 'bar',barWidth:50, label: { show: true, position: 'top',fontSize: 25 } }, \n" +
" {name:'科研型',type: 'bar',barWidth:50, label: { show: true, position: 'top',fontSize: 25 } }, \n" +
" {name:'教学型',type: 'bar',barWidth:50, label: { show: true, position: 'top',fontSize: 25 } },\n" +
" {name:'科研型',type: 'bar',barWidth:50, label: { show: true, position: 'top',fontSize: 25 } },\n" +
" {name:'辅导员',type: 'bar',barWidth:50, label: { show: true, position: 'top',fontSize: 25 } },\n" +
@ -1813,7 +1813,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
" tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
"formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
"data: ['答疑课程内容、指导课程作业','指导学期、学年和毕业论文','讨论世界观、人生观、价值观等问题','指导学生从事研究项目和竞赛活动','关注学生的心理健康状况','指导学生职业生涯规划与就业创业'],inverse:true }, series: [ " +
"{ name: '教学科研型', type: 'bar',\n" +
"{ name: '科研型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(sshdTjt31)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
"{ name: '教学型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(sshdTjt32)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
@ -1840,7 +1840,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
for(int i=0;i<sshdTjt2List.size();i++){
BlTeacherAnswer par = sshdTjt2List.get(i);
// sshdTjt2name[i] = par.getLsname();
if(StringUtils.equals(par.getLsname(),"教学科研型")){
if(StringUtils.equals(par.getLsname(),"科研型")){
sshdTjt21[0] = (int)Double.parseDouble(par.getTj1());
sshdTjt21[1] = (int)Double.parseDouble(par.getTj2());
sshdTjt21[2] = (int)Double.parseDouble(par.getTj3());
@ -1870,12 +1870,19 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
sshdTjt24[5] = (int)Double.parseDouble(par.getTj6());
}
}
// format(round(sum(EXCHANGE_ZDKC)/count('x'),2)*100,0) as tj1,<!-- 指导课程 1答疑课程内容、指导课程作业-->
// format(round(sum(EXCHANGE_ZDLW)/count('x'),2)*100,0) as tj2,<!-- 指导论文 2指导学期、学年和毕业论文-->
// format(round(sum(EXCHANGE_XLJK)/count('x'),2)*100,0) as tj3,<!-- 心里健康 3关注学生的心里健康状况-->
// format(round(sum(EXCHANGE_TLSG)/count('x'),2)*100,0) as tj4,<!-- 讨论三观 4讨论世界观、人生观、价值观等问题-->
// format(round(sum(EXCHANGE_ZDXM)/count('x'),2)*100,0) as tj5,<!-- 指导项目 5指导学生从事研究项目和竞赛活动-->
// format(round(sum(EXCHANGE_ZYGH)/count('x'),2)*100,0) as tj6 <!-- 职业规划 6指导学生职业生涯规划与就业创业-->
//多柱图
String sshdTjt22Options = "option = {title: { right: '30', text: '（%）', textStyle: { fontSize: 25 } },\n" +
" tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
"formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
"data: ['答疑课程内容、指导课程作业','讨论世界观、人生观、价值观等问题','关注学生的心理健康状况','我将“学生中心”理念全面落实在自己的各个教育教学工作中','指导学生从事研究项目和竞赛活动','职业生涯规划与就业创业',],inverse:true }, series: [ " +
"{ name: '教学科研型', type: 'bar',\n" +
"data: ['答疑课程内容、指导课程作业','指导学期、学年和毕业论文','关注学生的心里健康状况','讨论世界观、人生观、价值观等问题','指导学生从事研究项目和竞赛活动','指导学生职业生涯规划与就业创业',],inverse:true }, series: [ " +
"{ name: '科研型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(sshdTjt21)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
"{ name: '教学型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(sshdTjt22)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
@ -1982,7 +1989,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
Integer cgdxTjt2Num1[] = new Integer[5];//
for(int i=0;i<cgdxTjt2List.size();i++){
BlTeacherAnswer par = cgdxTjt2List.get(i);
if(StringUtils.equals(par.getLsname(),"教学科研型")){
if(StringUtils.equals(par.getLsname(),"科研型")){
cgdxTjt2Num[0] = (int)Double.parseDouble(par.getTj1());
cgdxTjt2Num[1] = (int)Double.parseDouble(par.getTj2());
cgdxTjt2Num[2] = (int)Double.parseDouble(par.getTj3());
@ -2001,7 +2008,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
" tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
"formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
"data: ['我会根据学生学习效果，及时反思总结，改进我的教学', '我明确任教课程对整体人才培养目标的关联与责任', '我很了解人才培养方案的主要内容', '我将“学生中心”理念全面落实在自己的各个教育教学工作中', '我会对应学生的毕业要求制定课程目标'],inverse:true }, series: [ {\n" +
" name: '教学科研型', type: 'bar',\n" +
" name: '科研型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(cgdxTjt2Num)+" ,label:{show: true,position: 'outside', fontSize: 20},}, {\n" +
" name: '教学型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(cgdxTjt2Num1)+" ,label:{show: true,position: 'outside', fontSize: 20},}, " +
@ -2215,7 +2222,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
btgwlxjskcjxrrszys1[2] = (int)Double.parseDouble(par.getTj3());
btgwlxjskcjxrrszys1[3] = (int)Double.parseDouble(par.getTj4());
btgwlxjskcjxrrszys1[4] = (int)Double.parseDouble(par.getTj5());
}else if(StringUtils.equals(par.getLsname(),"教学科研型")){
}else if(StringUtils.equals(par.getLsname(),"科研型")){
btgwlxjskcjxrrszys2[0] = (int)Double.parseDouble(par.getTj1());
btgwlxjskcjxrrszys2[1] = (int)Double.parseDouble(par.getTj2());
btgwlxjskcjxrrszys2[2] = (int)Double.parseDouble(par.getTj3());
@ -2228,7 +2235,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
" tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
"formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
"data: ['以讲授为主融入课程内容', '在学生参与讨论、展示等课堂互动环节中融入', '融入课堂作业、论文中', '融入实验、实训中', '并未涉及题目所述内容'],inverse:true }, series: [ {\n" +
" name: '教学科研型', type: 'bar',\n" +
" name: '科研型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(btgwlxjskcjxrrszys2)+" ,label:{show: true,position: 'outside', fontSize: 20},}, {\n" +
" name: '教学型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(btgwlxjskcjxrrszys1)+" ,label:{show: true,position: 'outside', fontSize: 20},} ] }";
@ -2344,7 +2351,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
btgwlxjszgxgzrdpjsjtr1[2] = (int)Double.parseDouble(par.getTj3());
btgwlxjszgxgzrdpjsjtr1[3] = (int)Double.parseDouble(par.getTj4());
btgwlxjszgxgzrdpjsjtr1[4] = (int)Double.parseDouble(par.getTj5());
}else if(StringUtils.equals(par.getLsname(),"教学科研型")){
}else if(StringUtils.equals(par.getLsname(),"科研型")){
btgwlxjszgxgzrdpjsjtr2[0] = (int)Double.parseDouble(par.getTj1());
btgwlxjszgxgzrdpjsjtr2[1] = (int)Double.parseDouble(par.getTj2());
btgwlxjszgxgzrdpjsjtr2[2] = (int)Double.parseDouble(par.getTj3());
@ -2357,7 +2364,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
" tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
"formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
"data: ['低年级本科专业必修课', '专业选修课', '研究生课程', '高年级本科专业必修课', '公共通识课程'],inverse:true }, series: [ {\n" +
" name: '教学科研型', type: 'bar',\n" +
" name: '科研型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(btgwlxjszgxgzrdpjsjtr2)+" ,label:{show: true,position: 'outside', fontSize: 20},}, {\n" +
" name: '教学型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(btgwlxjszgxgzrdpjsjtr1)+" ,label:{show: true,position: 'outside', fontSize: 20},} ] }";
@ -2462,7 +2469,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
Integer btgwlxpjsjTj2[] = new Integer[6];//
for(int i=0;i<btgwlxpjsjTjtList.size();i++){
BlTeacherAnswer par = btgwlxpjsjTjtList.get(i);
if(StringUtils.equals(par.getLsname(),"教学科研型")){
if(StringUtils.equals(par.getLsname(),"科研型")){
btgwlxpjsjTj1[0] = (int)Double.parseDouble(par.getTj1());
btgwlxpjsjTj1[1] = (int)Double.parseDouble(par.getTj2());
btgwlxpjsjTj1[2] = (int)Double.parseDouble(par.getTj3());
@ -2483,7 +2490,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
" tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } }, legend: { textStyle: { color: '#000', fontSize: 24, fontFamily: '宋体' } }, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value',position: 'top', boundaryGap: [0, 0.01] }, yAxis: {axisLabel: {color: '#333',fontSize: 25," +
"formatter: function (value) { let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;}}, type: 'category',\n" +
"data: ['科研工作', '教学准备（包括批阅学生作业和评分）', '教学任务', '给学生答疑和辅导', '院系／部门工作和会议及其他行政工作', '兼职及其他社会服务工作'],inverse:true }, series: [ {\n" +
" name: '教学科研型', type: 'bar',\n" +
" name: '科研型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(btgwlxpjsjTj1)+" ,label:{show: true,position: 'outside', fontSize: 20},}, {\n" +
" name: '教学型', type: 'bar',\n" +
" data: "+JSONObject.toJSONString(btgwlxpjsjTj2)+" ,label:{show: true,position: 'outside', fontSize: 20},} ] }";
@ -2633,17 +2640,20 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
"polar: { radius: '50%' }, radiusAxis: { show: false }, angleAxis: {show: true, interval: 1,min: 0, max: 6, inverse: true,axisLine: {lineStyle: {color: 'rgba(0,0,0,0)'}},axisTick: {show: false,inside: true},\n" +
" axisLabel: {textStyle: {color: '#000',fontSize: 25,fontFamily: '宋体',fontWeight:700},formatter: (i) => "+JSONObject.toJSONString(ldt2Data)+"[i]}\n" +
" }," +
"radar: { radius: '50%',axisName: { fontSize: 30, color: '#000', padding: 50,fontFamily: '宋体', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" +
"radar: { radius: '40%',axisName: { fontSize: 20, color: '#000', padding: 90,fontFamily: '宋体', formatter: function (value) { let list = value.split(''); let result = ''; for (let i = 1; i <= list.length; i++) { if (!(i % 10) && list[i] != undefined) { result += list[i - 1] + '\\n'; } else { result += list[i - 1];}}return result;}},indicator: [\n" +
" { name: '热爱工作，能以最大的热情投身教育行业，积极主动学习', max: 5 },\n" +
" { name: '关爱学生，积极帮助学生解决生活或学习上的困难', max: 5 },\n" +
" { name: '关注学生的心理健康状况', max: 5 },\n" +
" { name: '教学有序，有清晰合理的教学目标并能清楚地向学生解释', max: 5 },\n" +
" { name: '育人有方，激发学生的学习兴趣，注重培养学生的创新精神和创新思维', max: 5 },\n" +
" { name: '以身作则，信守承诺', max: 5 },\n" +
" ],name: {textStyle: {color: 'black',fontSize: 25,fontFamily:'宋体',lineHeight: 24,},\n" +
" ],name: {textStyle: {color: 'black',fontSize: 20,fontFamily:'宋体',lineHeight: 24,},\n" +
" formatter: function (value) {let list = value.split(\"\");let result = \"\"; for (let i = 1; i <= list.length; i++) {if (!(i % 17) && list[i] != undefined) { result += list[i - 1] + '\\n';} else {result += list[i - 1];} }return result;},},},\n" +
" series: [{type: 'radar',data: [{value: \n" +JSONObject.toJSONString(ldt2Data)+ " ,label:{show: false,position: 'outside',fontSize: 25},},]}]}";
String jsjbxwhpLdtImg4 = WebDriverUtil.getImgByte500(jsjbxwhpLdtImg4Ldt);
" series: [{type: 'radar',data: [{value: \n" +JSONObject.toJSONString(ldt2Data)+ " ,label:{show: false,position: 'outside',fontSize: 20},},]}]}";
String jsjbxwhpLdtImg4 = WebDriverUtil.getImgByte(jsjbxwhpLdtImg4Ldt, "echarts600.html");
// Map<String, String> runJs = Maps.newHashMap();
// runJs.put("runBefore","changeWH('600px','600px');");//自定宽高
// String jsjbxwhpLdtImg4 = WebDriverUtil.getImgByteAuto(jsjbxwhpLdtImg4Ldt, runJs);
log.info("================================");
log.info(jsjbxwhpLdtImg4);
log.info("================================");

2
jeecg-boot/jeecg-module-demo/src/main/resources/officetemplates/exp1/teacher-tjfx.docx
View File

@ -157,7 +157,7 @@ z
教师基本行为互评各项占比
在教师的基本行为方面，该校教师评价周围同事"热爱工作，能以最大的热情投身教育行业，积极主动学习"的符合程度得分为{jsjbxwhppf1}分，"关爱学生，积极帮助学生解决生活或学习上的困难"的符合程度得分为{jsjbxwhppf2}分，"关注学生的心理健康状况"的符合程度得分为{jsjbxwhppf3}分，"教学有序，有清晰合理的教学目标并能清楚地向学生解释"的符合程度得分为{jsjbxwhppf4}分，"育人有方，激发学生的学习兴趣，注重培养学生的创新精神和创新思维"的符合程度得分为{jsjbxwhppf5}分，"以身作则，信守承诺"的符合程度得分为{jsjbxwhppf6}分。
<jsjbxwhpLdtImg4,400,200>
<jsjbxwhpLdtImg4,400,250>
教师基本行为互评
注：图表中数值为计算所得平均分数。