修改bug

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/blTeacherAnswer/mapper/BlTeacherAnswerMapper.java

@@ -181,4 +181,6 @@ public interface BlTeacherAnswerMapper extends BaseMapper<BlTeacherAnswer> {
     BlTeacherAnswer getSelectzytjpj2Ldt(BlTeacherInfo blTeacherMain);
     //教学任务分配情况百分比
     BlTeacherAnswer getSelectJxrwfpqkbfb2(BlTeacherInfo blTeacherMain);
+
+    List<BlTeacherAnswer> getSelectzytjpj32(BlTeacherInfo blTeacherMain);
 }

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

@@ -164,7 +164,7 @@
         select DEPARTMENT as lsname,
         round(sum(SDSF_YFYG2)/count('x'),2) as tj1,
         round(sum(SDSF_GXAH2)/count('x'),2) as tj2,
-        round(sum(SDSF_GXAH2)/count('x'),2) as tj3
+        round(sum(SDSF_JSMM2)/count('x'),2) as tj3
         from bl_teacher_answer where main_id = #{id} GROUP BY DEPARTMENT order by DEPARTMENT
     </select>
 
@@ -1558,7 +1558,7 @@
         max(CASE POSITION = '初级' WHEN '初级' THEN (select round(sum(DEDICATION_APPLY2)/count('x'),2) from bl_teacher_answer where POSITION = '初级' and main_id = #{id} GROUP BY POSITION) END) as tj4
         FROM bl_teacher_answer
         union ALL
-        SELECT '我和同事们都注重提升产学研用能力' as lsname,
+        SELECT '我和同事们的教学和科研投入分配合理' as lsname,
         max(CASE POSITION = '正高级' WHEN '正高级' THEN (select round(sum(DEDICATION_DISTRIBUTION2)/count('x'),2) from bl_teacher_answer where POSITION = '正高级' and main_id = #{id} GROUP BY POSITION) END) as tj1,
         max(CASE POSITION = '副高级' WHEN '副高级' THEN (select round(sum(DEDICATION_DISTRIBUTION2)/count('x'),2) from bl_teacher_answer where POSITION = '副高级' and main_id = #{id} GROUP BY POSITION) END) as tj2,
         max(CASE POSITION = '中级' WHEN '中级' THEN (select round(sum(DEDICATION_DISTRIBUTION2)/count('x'),2) from bl_teacher_answer where POSITION = '中级' and main_id = #{id} GROUP BY POSITION) END) as tj3,
@@ -1942,4 +1942,8 @@
         round(sum(TEACHING_AWARDS2)/count('x'),2) as tj6
         from bl_teacher_answer where main_id = #{id}
     </select>
+    <!--   不同岗位类型教师对本校教学评价各方面工作的评价 -->
+    <select id="getSelectzytjpj32" resultType="org.jeecg.modules.demo.blTeacherAnswer.entity.BlTeacherAnswer">
+
+    </select>
 </mapper>

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

@@ -198,16 +198,16 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         }
         //堆叠图 - 教师的师德师风互评各项占比
         String sdsfhpZztImg1Options ="option = { tooltip: { trigger: 'axis', axisPointer: { type: 'shadow'  } },\n" +
-                "  legend: { textStyle: {color:'#333', fontSize: 18  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
+                "  legend: { textStyle: {color:'#333', fontSize: 30  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
                 "    data: "+JSONObject.toJSONString(strName)+",\n" +
-                "    axisLabel: {color:'#333', fontSize: 17, 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;} } },\n" +
+                "    axisLabel: {color:'#333', fontSize: 30, 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: [ { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: "+ JSONObject.toJSONString(sdsfhpzztFcfh)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
                 "    { name: '比较符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: "+JSONObject.toJSONString(sdsfhpzztBjfh)+", barWidth: 45, itemStyle: { color: '#008ac8' } },\n" +
                 "    { name: '一般', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 },emphasis: {focus: 'series'},\n" +
                 "      data: "+JSONObject.toJSONString(sdsfhpzztYb)+", barWidth: 45,itemStyle: {color: '#57b8e7'}},]}";
-
+        System.out.println("option---------------->"+sdsfhpZztImg1Options);
         String sdsfhpZztImg1 = WebDriverUtil.getImgByte300(sdsfhpZztImg1Options);
         System.out.println("================================");
         System.out.println(sdsfhpZztImg1);
@@ -232,8 +232,8 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "      { name: '依法依规，履行教师职责', max: 5 },\n" +
                 "      { name: '关心爱护学生', max: 5 },\n" +
                 "      { name: '精神面貌及品德修养良好', max: 5 },\n" +
-                "    ],name: {textStyle: {color: 'black',fontSize: 20,lineHeight: 24,},\n" +
+                "    ],name: {textStyle: {color: 'black',fontSize: 30,lineHeight: 24,},\n" +
-                "  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;},},},\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(ldt1Data)+  "  ,label:{show: true,position: 'outside',fontSize:20},},]}]}";
         String sdsfhpLdtImg2 = WebDriverUtil.getImgByte400(sdsfhpLdtImg2Ldt);
         System.out.println("================================");
@@ -301,9 +301,9 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         }
         //堆叠图
         String jsjbxwhpTjtImg3Options ="option = { tooltip: { trigger: 'axis', axisPointer: { type: 'shadow'  } },\n" +
-                "  legend: { textStyle: {color:'#333', fontSize: 18  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
+                "  legend: { textStyle: {color:'#333', fontSize: 30  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
                 "    data: "+JSONObject.toJSONString(jsjbxwName)+",\n" +
-                "    axisLabel: {color:'#333', fontSize:17,   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;} } },\n" +
+                "    axisLabel: {color:'#333', fontSize:17,   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: [ { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: "+ JSONObject.toJSONString(jsjbxwFcfh)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
                 "    { name: '比较符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
@@ -353,7 +353,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "      { name: '育人有方，激发学生的学习兴趣，注重培养学生的创新精神和创新思维', max: 5 },\n" +
                 "      { name: '以身作则，信守承诺', max: 5 },\n" +
                 "    ],name: {textStyle: {color: 'black',fontSize: 20,lineHeight: 24,},\n" +
-                "  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;},},},\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: true,position: 'outside',fontSize:20},},]}]}";
         String jsjbxwhpLdtImg4 = WebDriverUtil.getImgByte500(jsjbxwhpLdtImg4Ldt);
         System.out.println("================================");
@@ -419,9 +419,9 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
             jxnlpjName[i] = par.getLsname();
         }
         String jsdjxnlgfmpggxzbImg5Options ="option = { tooltip: { trigger: 'axis', axisPointer: { type: 'shadow'  } },\n" +
-                "  legend: { textStyle: {color:'#333', fontSize: 18  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
+                "  legend: { textStyle: {color:'#333', fontSize: 30  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
                 "    data: "+JSONObject.toJSONString(jxnlpjName)+",\n" +
-                "    axisLabel: {color:'#333', fontSize:17,  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;} } },\n" +
+                "    axisLabel: {color:'#333', fontSize:17,  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: [ { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: "+ JSONObject.toJSONString(jxnlpjFcfh)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
                 "    { name: '比较符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
@@ -451,11 +451,11 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         result.put("jsnggfmpj5", jsnggfmpj5);
 
         Double ldt3Data[] = new Double[5];
-        ldt3Data[0] = Double.parseDouble(jsjbxwhppf1);
+        ldt3Data[0] = Double.parseDouble(jsnggfmpj1);
-        ldt3Data[1] = Double.parseDouble(jsjbxwhppf2);
+        ldt3Data[1] = Double.parseDouble(jsnggfmpj2);
-        ldt3Data[2] = Double.parseDouble(jsjbxwhppf3);
+        ldt3Data[2] = Double.parseDouble(jsnggfmpj3);
-        ldt3Data[3] = Double.parseDouble(jsjbxwhppf4);
+        ldt3Data[3] = Double.parseDouble(jsnggfmpj4);
-        ldt3Data[4] = Double.parseDouble(jsjbxwhppf5);
+        ldt3Data[4] = Double.parseDouble(jsnggfmpj5);
         //雷达图
         String jsdjxnlgfmpggxzbLdtImg6Ldt = "option = { radar: { radius: '60%',indicator: [\n" +
                 "      { name: '教学认知能力', max: 5 },\n" +
@@ -464,7 +464,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "      { name: '教学评价能力', max: 5 },\n" +
                 "      { name: '运用媒介能力', max: 5 },\n" +
                 "    ],name: {textStyle: {color: 'black',fontSize: 20,lineHeight: 24,},\n" +
-                "  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;},},},\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(ldt3Data)+  "  ,label:{show: true,position: 'outside',fontSize:20},},]}]}";
         String jsdjxnlgfmpggxzbLdtImg6 = WebDriverUtil.getImgByte500(jsdjxnlgfmpggxzbLdtImg6Ldt);
         System.out.println("================================");
@@ -536,7 +536,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                         "  xAxis: { type: 'value',position: 'top',splitLine: {lineStyle: {type: 'dashed'}}},\n" +
                         "  yAxis: {type: 'category',\n" +
                         "    data:"+JSONObject.toJSONString(cnrName)+",\n" +
-                        " axisLabel:{color:'#333',fontSize:17,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;}}"+
+                        " axisLabel:{color:'#333',fontSize:17,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: 'bar',label: {show: true,},\n" +
                         "      data: "+JSONObject.toJSONString(cnrFcfh)+" \n" +
@@ -680,7 +680,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "  xAxis: { type: 'value',position: 'top',splitLine: {lineStyle: {type: 'dashed'}}},\n" +
                 "  yAxis: {type: 'category',\n" +
                 "    data:"+JSONObject.toJSONString(jszgljxrwfpblname)+",\n" +
-                " axisLabel:{color:'#333',fontSize:17,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;}}"+
+                " axisLabel:{color:'#333',fontSize:17,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: 'bar',label: {show: true,},\n" +
                 "      data: "+JSONObject.toJSONString(jszgljxrwfpblData)+" \n" +
@@ -817,7 +817,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "  xAxis: { type: 'value',position: 'top',splitLine: {lineStyle: {type: 'dashed'}}},\n" +
                 "  yAxis: {type: 'category',\n" +
                 "    data:"+JSONObject.toJSONString(kcjxrrszysTjt2)+",\n" +
-                " axisLabel:{color:'#333',fontSize:17,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;}}"+
+                " axisLabel:{color:'#333',fontSize:17,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: 'bar',label: {show: true,},\n" +
                 "      data: "+JSONObject.toJSONString(kcjxrrszysTjt1)+" \n" +
@@ -955,9 +955,9 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         }
         //堆叠图  教师在课程“两性一度”的实施情况各项占比
         String kclxyd16Options ="option = { tooltip: { trigger: 'axis', axisPointer: { type: 'shadow'  } },\n" +
-                "  legend: { textStyle: {color:'#333', fontSize: 18  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
+                "  legend: { textStyle: {color:'#333', fontSize: 30  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
                 "    data: "+JSONObject.toJSONString(kclxydTjfxName)+",\n" +
-                "    axisLabel: {color:'#333', fontSize:17,  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;} } },\n" +
+                "    axisLabel: {color:'#333', fontSize:17,  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: [ { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: "+ JSONObject.toJSONString(kclxydTjfxDdt1)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
                 "    { name: '比较符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
@@ -1007,7 +1007,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "      { name: '课程教学内容重视实践与理论的结合', max: 5 },\n" +
                 "      { name: '需要非常努力才能达到课程要求', max: 5 },\n" +
                 "    ],name: {textStyle: {color: 'black',fontSize: 20,lineHeight: 24,},\n" +
-                "  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;},},},\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(ldtLxydData)+  "  ,label:{show: true,position: 'outside',fontSize:20},},]}]}";
         String kclxyd17 = WebDriverUtil.getImgByte(kclxyd17Ldt);
         System.out.println("================================");
@@ -1081,7 +1081,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "  xAxis: { type: 'value',position: 'top',splitLine: {lineStyle: {type: 'dashed'}}},\n" +
                 "  yAxis: {type: 'category',\n" +
                 "    data:"+JSONObject.toJSONString(cgdxTjt1Name)+",\n" +
-                " axisLabel:{  fontSize:17,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;}}"+
+                " axisLabel:{  fontSize:17,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: 'bar',label: {show: true,},\n" +
                 "      data: "+JSONObject.toJSONString(cgdxTjt1Num)+" \n" +
@@ -1220,7 +1220,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "  xAxis: { type: 'value',position: 'top',splitLine: {lineStyle: {type: 'dashed'}}},\n" +
                 "  yAxis: {type: 'category',\n" +
                 "    data:"+JSONObject.toJSONString(sshdbfbztName)+",\n" +
-                " axisLabel:{color:'#333',fontSize:17,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;}}"+
+                " axisLabel:{color:'#333',fontSize:17,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: 'bar',label: {show: true,},\n" +
                 "      data: "+JSONObject.toJSONString(sshdbfbzt1)+" \n" +
@@ -1387,7 +1387,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         String xsxxzdxTjt1ImgOptions ="option = { tooltip: { trigger: 'axis', axisPointer: { type: 'shadow'  } },\n" +
                 "   grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
                 "    data: "+JSONObject.toJSONString(xsxxzdxTjt1Name)+",\n" +
-                "    axisLabel: {color:'#333',fontSize:17, 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;} } },\n" +
+                "    axisLabel: {color:'#333',fontSize:17, 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: [ " +
                 "    { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: "+JSONObject.toJSONString(xsxxzdxTjt11)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
@@ -1492,9 +1492,9 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         }
         //堆叠图
         String jsfz1ImgOptions ="option = { tooltip: { trigger: 'axis', axisPointer: { type: 'shadow'  } },\n" +
-                "  legend: { textStyle: {color:'#333', fontSize: 18  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
+                "  legend: { textStyle: {color:'#333', fontSize: 30  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
                 "    data: "+JSONObject.toJSONString(jsfz1Name)+",\n" +
-                "    axisLabel: {color:'#333', fontSize:17,  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;} } },\n" +
+                "    axisLabel: {color:'#333', fontSize:17,  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: [ " +
                 "    { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: "+ JSONObject.toJSONString(jsfz11)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
@@ -1532,7 +1532,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "      { name: '教师培训内容丰富，对教学和职业发展有帮助', max: 100 },\n" +
                 "      { name: '国际交流与培训活动', max: 100 },\n" +
                 "    ],name: {textStyle: {color: 'black',fontSize: 20,lineHeight: 24,},\n" +
-                "  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;},},},\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(jsfz2Data)+  "  ,label:{show: true,position: 'outside',fontSize:20},},]}]}";
         String jsfz27 = WebDriverUtil.getImgByte(jsfz2optionsLdt);
         System.out.println("================================");
@@ -1607,9 +1607,9 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         }
         //堆叠图
         String zyfwyzc1ImgOptions ="option = { tooltip: { trigger: 'axis', axisPointer: { type: 'shadow'  } },\n" +
-                "  legend: { textStyle: {color:'#333', fontSize: 18  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
+                "  legend: { textStyle: {color:'#333', fontSize: 30  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
                 "    data: "+JSONObject.toJSONString(zyfwyzc1Name)+",\n" +
-                "    axisLabel: {color:'#333', fontSize:17,  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;} } },\n" +
+                "    axisLabel: {color:'#333', fontSize:17,  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: [ " +
                 "    { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: "+ JSONObject.toJSONString(zyfwyzc11)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
@@ -1653,7 +1653,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "      { name: '我和同事们都注重提升产学研用能力', max: 5 },\n" +
                 "      { name: '我和同事们的教学和科研投入分配合理', max: 5 },\n" +
                 "    ],name: {textStyle: {color: 'black',fontSize: 20,lineHeight: 24,},\n" +
-                "  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;},},},\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(zyfwyzc2Data)+  "  ,label:{show: true,position: 'outside',fontSize:20},},]}]}";
         String zyfwyzc27 = WebDriverUtil.getImgByte(zyfwyzc2optionsLdt);
         System.out.println("================================");
@@ -1729,9 +1729,9 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         }
         //堆叠图
         String zytjpj1ImgOptions ="option = { tooltip: { trigger: 'axis', axisPointer: { type: 'shadow'  } },\n" +
-                "  legend: { textStyle: {color:'#333', fontSize: 18  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
+                "  legend: { textStyle: {color:'#333', fontSize: 30  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
                 "    data: "+JSONObject.toJSONString(zytjpj1Name)+",\n" +
-                "    axisLabel: {color:'#333', fontSize:17,  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;} } },\n" +
+                "    axisLabel: {color:'#333', fontSize:17,  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: [ " +
                 "    { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: "+ JSONObject.toJSONString(zytjpj11)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
@@ -1754,12 +1754,12 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
 
         //教师对本校教学评价各方面工作的评价
         BlTeacherAnswer zytjpj2Ldt = baseMapper.getSelectzytjpj2Ldt(blTeacherMain);
-        result.put("zytjpjbfb1", zytjpj2Ldt.getTj1());
+        result.put("zypjgzbfb1", zytjpj2Ldt.getTj1());
-        result.put("zytjpjbfb2", zytjpj2Ldt.getTj2());
+        result.put("zypjgzbfb2", zytjpj2Ldt.getTj2());
-        result.put("zytjpjbfb3", zytjpj2Ldt.getTj3());
+        result.put("zypjgzbfb3", zytjpj2Ldt.getTj3());
-        result.put("zytjpjbfb4", zytjpj2Ldt.getTj4());
+        result.put("zypjgzbfb4", zytjpj2Ldt.getTj4());
-        result.put("zytjpjbfb5", zytjpj2Ldt.getTj5());
+        result.put("zypjgzbfb5", zytjpj2Ldt.getTj5());
-        result.put("zytjpjbfb6", zytjpj2Ldt.getTj6());
+        result.put("zypjgzbfb6", zytjpj2Ldt.getTj6());
 
         Double zytjpj2Data[] = new Double[6];
         zytjpj2Data[0] = Double.parseDouble(zytjpj2Ldt.getTj1());
@@ -1777,7 +1777,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "      { name: '教学督导员的督导对我的教学工作帮助很大', max: 5 },\n" +
                 "      { name: '学校教学激励制度完善，并促进了教师的教学积极性', max: 5 },\n" +
                 "    ],name: {textStyle: {color: 'black',fontSize: 20,lineHeight: 24,},\n" +
-                "  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;},},},\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(zytjpj2Data)+  "  ,label:{show: true,position: 'outside',fontSize:20},},]}]}";
         String zytjpj27 = WebDriverUtil.getImgByte(zytjpj2optionsLdt);
         System.out.println("================================");
@@ -1786,7 +1786,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         result.put("jxpjgz31", zytjpj27);
 
         //不同岗位类型教师对本校教学评价各方面工作的评价
-        List<BlTeacherAnswer> zytjpj3List = baseMapper.getSelectzytjpj3(blTeacherMain);
+        List<BlTeacherAnswer> zytjpj3List = baseMapper.getSelectjxpjgz3(blTeacherMain);
         List<List<String>> zytjpj21list = Lists.newArrayList();
         for(BlTeacherAnswer par:zytjpj3List){
             List<String> list = Lists.newArrayList();
@@ -1800,7 +1800,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         wo.insert2Table(27, 1, true, zytjpj21list);
 
         //不同职称教师对本校教学评价各方面工作的评价
-        List<BlTeacherAnswer> zytjpj4List = baseMapper.getSelectzytjpj4(blTeacherMain);
+        List<BlTeacherAnswer> zytjpj4List = baseMapper.getSelectjxpjgz4(blTeacherMain);
         List<List<String>> zytjpj22list = Lists.newArrayList();
         for(BlTeacherAnswer par:zytjpj4List){
             List<String> list = Lists.newArrayList();
@@ -1849,9 +1849,9 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         }
         //堆叠图
         String zytjpj2ImgOptions ="option = { tooltip: { trigger: 'axis', axisPointer: { type: 'shadow'  } },\n" +
-                "  legend: { textStyle: {color:'#333', fontSize: 18  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
+                "  legend: { textStyle: {color:'#333', fontSize: 30  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
                 "    data: "+JSONObject.toJSONString(zytjpj2Name)+",\n" +
-                "    axisLabel: {color:'#333', fontSize:17,  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;} } },\n" +
+                "    axisLabel: {color:'#333', fontSize:17,  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: [ " +
                 "    { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: "+ JSONObject.toJSONString(zytjpj21)+", barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
@@ -1894,7 +1894,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
                 "      { name: '网络资源', max: 100 },\n" +
                 "      { name: '体育文化等基础设施', max: 100 },\n" +
                 "    ],name: {textStyle: {color: 'black',fontSize: 20,lineHeight: 24,},\n" +
-                "  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;},},},\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(zytjpj12Data)+  "  ,label:{show: true,position: 'outside',fontSize:20},},]}]}";
         String zytjpj127 = WebDriverUtil.getImgByte(zytjpj12optionsLdt);
         System.out.println("================================");
@@ -1958,9 +1958,9 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
         //教师对学校的整体满意度各项占比
         //堆叠图
         String ztmydzb1Options ="option = { tooltip: { trigger: 'axis', axisPointer: { type: 'shadow'  } },\n" +
-                "  legend: { textStyle: {color:'#333', fontSize: 18  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
+                "  legend: { textStyle: {color:'#333', fontSize: 30  }}, grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true }, xAxis: { type: 'value' }, yAxis: {  type: 'category',\n" +
                 "    data: ['对学校的整体满意度'],\n" +
-                "    axisLabel: {color:'#333', fontSize:17,  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;} } },\n" +
+                "    axisLabel: {color:'#333', fontSize:17,  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: [ { name: '非常符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
                 "      data: ["+(int)Double.parseDouble(ztmydzb.getTj1())+"], barWidth: 45, itemStyle: { color: '#2350a0' } },\n" +
                 "    { name: '比较符合', type: 'bar', stack: 'total', label: { show: true, fontSize: 30 }, emphasis: { focus: 'series' },\n" +
@@ -2011,7 +2011,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
             }
         }
         String xxztmyd3Options ="option = {\n" +
-                "  title: {subtext: '(%)'},legend: { textStyle: {color:'#333', fontSize: 18  }},tooltip: {},\n" +
+                "  title: {subtext: '(%)'},legend: { textStyle: {color:'#333', fontSize: 30  }},tooltip: {},\n" +
                 "  dataset: {source: [ \n" +
                 "      ['对学校整体的满意度', "+num1+", "+num2+", "+num3+", "+num4+"], \n" +
                 "    ]},xAxis: { type: 'category' },yAxis: {}, \n" +
@@ -2046,7 +2046,7 @@ public class BlTeacherAnswerServiceImpl extends ServiceImpl<BlTeacherAnswerMappe
             }
         }
         String zcxxztmyd3Options ="option = {\n" +
-                "  title: {subtext: '(%)'},legend: { textStyle: {color:'#333', fontSize: 18  }},tooltip: {},\n" +
+                "  title: {subtext: '(%)'},legend: { textStyle: {color:'#333', fontSize: 30  }},tooltip: {},\n" +
                 "  dataset: {source: [ \n" +
                 "      ['对学校整体的满意度', "+zcnum1+", "+zcnum2+", "+zcnum3+", "+zcnum4+"], \n" +
                 "    ]},xAxis: { type: 'category' },yAxis: {}, \n" +