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

修改bug

This commit is contained in:
yangjun 2024-11-18 13:23:42 +08:00
parent c2d96e25d2
commit b407360c75
9 changed files with 2735 additions and 2680 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbb16/controller/TjbbController.java
View File

@ -34,6 +34,7 @@ import org.jeecg.modules.tjbb.tjbbSf3.entity.TjbbSf3;
import org.jeecg.modules.tjbb.tjbbSf3.service.ITjbbSf3Service;
import org.jeecg.modules.tjbb.tjbbSf5.entity.TjbbSf5;
import org.jeecg.modules.tjbb.tjbbSf5.service.ITjbbSf5Service;
import org.jeecg.modules.tjbb.tjbbSf6.entity.TjbbSf6;
import org.jeecg.modules.tjbb.tjbbSf6.service.ITjbbSf6Service;
import org.jeecg.modules.tjbb.tjbbSf8.entity.TjbbSf8;
import org.jeecg.modules.tjbb.tjbbSf8.service.ITjbbSf8Service;
@ -153,19 +154,17 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
List<ExcelExportEntity> entityList = new ArrayList<>();
//获取列头
QueryWrapper<Tjbb_141> tjbb141QueryWrapper = new QueryWrapper<>();
tjbb141QueryWrapper.eq("sfsflzy","S");
tjbb141QueryWrapper.orderByAsc("xnzydm");
List<Tjbb_141> headList = tjbb_141Service.list(tjbb141QueryWrapper);
QueryWrapper<TjbbSf5> TjbbSf5QueryWrapper = new QueryWrapper<>();
TjbbSf5QueryWrapper.orderByAsc("xnzydm");
List<TjbbSf5> headList = tjbbSf5Service.list(TjbbSf5QueryWrapper);
//表头
List<String> heade = new ArrayList<>();
heade.add("维度");
heade.add("监测指标");
heade.add("监测指标1");
heade.add("监测指标2");
heade.add("一级参考标准");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
heade.add(par.getXnzymc());
}
//动态表头
@ -180,12 +179,11 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
Map<String,Object> objectMap = new HashMap<>();
objectMap.put("维度","课程与教学");
objectMap.put("监测指标","1");
objectMap.put("监测指标1","教师教育课程学分");
objectMap.put("监测指标2","必修课");
objectMap.put("监测指标1","教师教育课程必修课学分");
objectMap.put("一级参考标准","必修课≥10学分");
List<TjbbSf5> zbsf5List = tjbbSf5Service.list(new QueryWrapper<>());
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getJsjykcbx).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -193,10 +191,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap = new HashMap<>();
objectMap.put("维度","课程与教学");
objectMap.put("监测指标","1.1");
objectMap.put("监测指标1","教师教育课程学分");
objectMap.put("监测指标2","总学分");
objectMap.put("监测指标1","教师教育课程总学分");
objectMap.put("一级参考标准","总学分≥14学分");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getJsjykcxj).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -205,9 +202,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","课程与教学");
objectMap.put("监测指标","2");
objectMap.put("监测指标1","人文社会与科学素养课程学分占总学分比例");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≥10%");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
String rwshykxsykc = zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getRwshykxsykc).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String xfzj = zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getXfzj).collect(Collectors.joining(SymbolConstant.SEMICOLON));
objectMap.put(par.getXnzymc(), StringUtils.isEmpty(xfzj)?null:new DecimalFormat("#0.00%").format(Double.parseDouble(rwshykxsykc)/Double.parseDouble(xfzj)));
@ -218,9 +214,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","课程与教学");
objectMap.put("监测指标","2.1");
objectMap.put("监测指标1","人文社会与科学素养课程学分");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getRwshykxsykc).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -229,9 +224,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","课程与教学");
objectMap.put("监测指标","2.2");
objectMap.put("监测指标1","总学分");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getXfzj).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -240,9 +234,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","课程与教学");
objectMap.put("监测指标","3");
objectMap.put("监测指标1","学科专业课程学分占总学分比例");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≥50%");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
String xkzykc = zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getXkzykc).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String xfzj = zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getXfzj).collect(Collectors.joining(SymbolConstant.SEMICOLON));
objectMap.put(par.getXnzymc(), StringUtils.isEmpty(xfzj)?null:new DecimalFormat("#0.00%").format(Double.parseDouble(xkzykc)/Double.parseDouble(xfzj)));
@ -253,9 +246,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","课程与教学");
objectMap.put("监测指标","3.1");
objectMap.put("监测指标1","学科专业课程学分");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getXkzykc).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -264,9 +256,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","课程与教学");
objectMap.put("监测指标","3.2");
objectMap.put("监测指标1","总学分");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getXfzj).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -275,9 +266,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","合作与实践");
objectMap.put("监测指标","4");
objectMap.put("监测指标1","教育实践时间");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≥18周");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getJysjsjzj).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -286,11 +276,10 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","合作与实践");
objectMap.put("监测指标","5");
objectMap.put("监测指标1","实习生数与教育实践基地数比例");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≤20:1");
List<Tjbb_24> zb24GpzyList = tjbb_24Service.getGroupByCountByXnzydm();
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
String sxss = zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getCjjysjsfssxzs).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String jdzs = zb24GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(Tjbb_24::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
if(!StringUtils.isEmpty(sxss) && !StringUtils.isEmpty(jdzs)){
@ -303,9 +292,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","合作与实践");
objectMap.put("监测指标","5.1");
objectMap.put("监测指标1","实习生数");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getCjjysjsfssxzs).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -314,9 +302,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","合作与实践");
objectMap.put("监测指标","5.2");
objectMap.put("监测指标1","教育实践基地数");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zb24GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(Tjbb_24::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -329,9 +316,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","6");
objectMap.put("监测指标1","生师比");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≤18:1");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
String bkss = zb16GpzyList.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String jysss = zbsf9GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf9::getSsyjss).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String jybss = zbsf9GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf9::getBsyjss).collect(Collectors.joining(SymbolConstant.SEMICOLON));
@ -361,9 +347,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","6.1");
objectMap.put("监测指标1","专业本科生数");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zb16GpzyList.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -372,9 +357,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","6.2");
objectMap.put("监测指标1","教育硕士数");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf9GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf9::getSsyjss).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -383,9 +367,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","6.3");
objectMap.put("监测指标1","教育博士数");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf9GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf9::getBsyjss).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -394,9 +377,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","6.4");
objectMap.put("监测指标1","留学生数");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf9GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf9::getBzklxss).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -405,20 +387,21 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","6.5");
objectMap.put("监测指标1","本专业专业教师");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zb152GpzyList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
//此项模板忽略
List<TjbbSf6> zbsf6AllList = tjbbSf6Service.getJsDisList();
objectMap = new HashMap<>();
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","7");
objectMap.put("监测指标1","学科课程与教学论教师");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","有");
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf6AllList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf6::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -428,9 +411,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","8");
objectMap.put("监测指标1","具有高级职称教师占专任教师比例");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≥学校平均水平");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
String gjzc = zb152GpgjList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String allteacher = zb152GpzyList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
if(!StringUtils.isEmpty(allteacher)){
@ -446,9 +428,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","8.1");
objectMap.put("监测指标1","高级职称教师");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zb152GpgjList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -457,9 +438,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","8.2");
objectMap.put("监测指标1","本专业专业教师");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zb152GpzyList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -470,9 +450,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","9");
objectMap.put("监测指标1","具有硕博士学位教师占专任教师比例");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≥60%");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
String sbsTeacher = zb152SbsList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String allteacher = zb152GpzyList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
if(!StringUtils.isEmpty(allteacher)){
@ -488,9 +467,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","9.1");
objectMap.put("监测指标1","硕博士学位教师");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zb152SbsList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -499,24 +477,22 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","9.2");
objectMap.put("监测指标1","本专业专业教师");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zb152GpzyList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
List<TjbbSf8> zbsf8AllList = tjbbSf8Service.getJsAllList();
List<TjbbSf8> zbsf8jzjsList = tjbbSf8Service.getJsJzjsList();
List<TjbbSf8> zbsf8AllList = tjbbSf8Service.getJsAllList();
objectMap = new HashMap<>();
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","10");
objectMap.put("监测指标1","中学兼职教师占教师教育课程教师比例");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≥20%");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
String jzjss = zbsf8jzjsList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf8::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String alljss = zbsf8AllList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf8::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
if(!StringUtils.isEmpty(alljss)){
@ -532,9 +508,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","10.1");
objectMap.put("监测指标1","本专业中学兼职教师");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf8jzjsList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf8::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -543,9 +518,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","师资队伍");
objectMap.put("监测指标","10.2");
objectMap.put("监测指标1","本专业教师教育教师");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf8AllList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf8::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -557,9 +531,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","11");
objectMap.put("监测指标1","教学日常运行支出占生均拨款总额与学费收入之和的比例");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≥13%");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
String jxrcyxzc = zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getJxrcyxzc).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String sjbkze = zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getSjbkze).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String xfsrzh = zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getXfsrzh).collect(Collectors.joining(SymbolConstant.SEMICOLON));
@ -579,9 +552,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","11.1");
objectMap.put("监测指标1","教学日常运行支出");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getJxrcyxzc).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -590,9 +562,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","11.2");
objectMap.put("监测指标1","生均拨款总额");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getSjbkze).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -601,9 +572,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","11.3");
objectMap.put("监测指标1","学费收入");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getXfsrzh).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -612,8 +582,17 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","12");
objectMap.put("监测指标1","生均教学日常运行支出");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准"," ≥学校平均水平");
for(TjbbSf5 par : headList){
String jxrcyxzc = zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getJxrcyxzc).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String bkss = zb16GpzyList.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
if(!StringUtils.isEmpty(jxrcyxzc)){
if(StringUtils.isEmpty(bkss)){
bkss = "0";
}
objectMap.put(par.getXnzymc(),StringUtils.isEmpty(jxrcyxzc)?null:new DecimalFormat("#0.00").format(Double.parseDouble(jxrcyxzc) * 10000/(Double.parseDouble(bkss))));
}
}
pageList.add(objectMap);
@ -621,9 +600,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","12.1");
objectMap.put("监测指标1","教学日常运行支出");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getJxrcyxzc).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -632,9 +610,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","12.2");
objectMap.put("监测指标1","本科在校生");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zb16GpzyList.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -643,17 +620,25 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","13");
objectMap.put("监测指标1","生均教育实践经费");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≥学校平均水平");
for(TjbbSf5 par : headList){
String jysjjf = zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getJysjjf).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String bkss = zb16GpzyList.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
if(!StringUtils.isEmpty(jysjjf)){
if(StringUtils.isEmpty(bkss)){
bkss = "0";
}
objectMap.put(par.getXnzymc(),StringUtils.isEmpty(jysjjf)?null:new DecimalFormat("#0.00").format(Double.parseDouble(jysjjf) * 10000/(Double.parseDouble(bkss))));
}
}
pageList.add(objectMap);
objectMap = new HashMap<>();
objectMap.put("维度","支持条件");
objectMap.put("监测指标","13.1");
objectMap.put("监测指标1","教育实践经费");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getJysjjf).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -662,9 +647,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","13.2");
objectMap.put("监测指标1","本科在校生");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zb16GpzyList.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -674,7 +658,6 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","14");
objectMap.put("监测指标1","生均教育类纸质图书");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≥30册");
pageList.add(objectMap);
@ -683,7 +666,6 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","14.1");
objectMap.put("监测指标1","生均教育类纸质图书");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","每6个实习生配备中学学科教材≥1套");
pageList.add(objectMap);
@ -692,7 +674,6 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","支持条件");
objectMap.put("监测指标","15");
objectMap.put("监测指标1","微格教学、语言技能、书写技能、学科实验教学实训室等教学设施");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","有");
pageList.add(objectMap);
@ -702,9 +683,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","学生发展");
objectMap.put("监测指标","16");
objectMap.put("监测指标1","教师资格证比例");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","≥75%");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
String jszgz = zbSf11List.stream().filter(zb->zb.getXnzymc().equals(par.getXnzymc())).map(TjbbSf11::getJszgz).collect(Collectors.joining(SymbolConstant.SEMICOLON));
String bjyrs = zb16Bjy.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
if(!StringUtils.isEmpty(jszgz)){
@ -720,9 +700,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","学生发展");
objectMap.put("监测指标","16.1");
objectMap.put("监测指标1","取得教师资格证人数");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zbSf11List.stream().filter(zb->zb.getXnzymc().equals(par.getXnzymc())).map(TjbbSf11::getJszgz).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);
@ -731,9 +710,8 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
objectMap.put("维度","学生发展");
objectMap.put("监测指标","16.2");
objectMap.put("监测指标1","毕业生人数");
objectMap.put("监测指标2","-");
objectMap.put("一级参考标准","");
for(Tjbb_141 par : headList){
for(TjbbSf5 par : headList){
objectMap.put(par.getXnzymc(),zb16Bjy.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
}
pageList.add(objectMap);

9
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbbSf6/entity/TjbbSf6.java
View File

@ -4,10 +4,8 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
@ -88,4 +86,7 @@ public class TjbbSf6 implements Serializable {
@Excel(name = "年级", width = 15)
@ApiModelProperty(value = "年级")
private java.lang.String nj;
@TableField(exist = false)
private String count;
}

1
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbbSf6/mapper/TjbbSf6Mapper.java
View File

@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface TjbbSf6Mapper extends BaseMapper<TjbbSf6> {
List<TjbbSf6> getJsDisList();
}

16
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbbSf6/mapper/xml/TjbbSf6Mapper.xml
View File

@ -2,4 +2,20 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.tjbb.tjbbSf6.mapper.TjbbSf6Mapper">
<select id="getJsDisList" resultType="org.jeecg.modules.tjbb.tjbbSf6.entity.TjbbSf6">
select a.xnzydm,count(a.xnzydm) as count from
(
SELECT
distinct
xnzydm,
SUBSTRING_INDEX( SUBSTRING_INDEX( skjsgh, ';', n ), ';', - 1 ) AS skjsgh
FROM
tjbb_sf6,
( SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, tjbb_sf6 ) x
WHERE
1 = 1
AND n &lt;= ( LENGTH( skjsgh ) - LENGTH( REPLACE ( skjsgh, ';', '' ) ) + 1 )
and kcxz = '学科课程与教学论课程'
) a GROUP BY a.xnzydm
</select>
</mapper>

3
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbbSf6/service/ITjbbSf6Service.java
View File

@ -3,6 +3,8 @@ package org.jeecg.modules.tjbb.tjbbSf6.service;
import org.jeecg.modules.tjbb.tjbbSf6.entity.TjbbSf6;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* @Description: tjbb_sf6
* @Author: jeecg-boot
@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ITjbbSf6Service extends IService<TjbbSf6> {
List<TjbbSf6> getJsDisList();
}

7
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbbSf6/service/impl/TjbbSf6ServiceImpl.java
View File

@ -7,6 +7,9 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.Collections;
import java.util.List;
/**
* @Description: tjbb_sf6
* @Author: jeecg-boot
@ -16,4 +19,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class TjbbSf6ServiceImpl extends ServiceImpl<TjbbSf6Mapper, TjbbSf6> implements ITjbbSf6Service {
@Override
public List<TjbbSf6> getJsDisList() {
return baseMapper.getJsDisList();
}
}

41
jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbbSf8/mapper/xml/TjbbSf8Mapper.xml
View File

@ -5,33 +5,66 @@
<select id="getJsAllList" resultType="org.jeecg.modules.tjbb.tjbbSf8.entity.TjbbSf8">
select a.xnzydm,count(a.xnzydm) as count from
(
select distinct * from (
SELECT
distinct
xnzydm,
SUBSTRING_INDEX( SUBSTRING_INDEX( skjsgh, ';', n ), ';', - 1 ) AS zdjsgh
FROM
tjbb_sf6,
( SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, tjbb_sf6 ) x
WHERE
1 = 1
AND n &lt;= ( LENGTH( skjsgh ) - LENGTH( REPLACE ( skjsgh, ';', '' ) ) + 1 )
union all
SELECT
distinct
xnzydm,
SUBSTRING_INDEX( SUBSTRING_INDEX( zdjsgh, ';', n ), ';', - 1 ) AS zdjsgh
FROM
tjbb_sf8,
( SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, tjbb_sf8 ) x
( SELECT @rownum1 := @rownum1 + 1 AS n FROM ( SELECT @rownum1 := 0 ) r, tjbb_sf8 ) x
WHERE
1 = 1
AND n &lt;= ( LENGTH( zdjsgh ) - LENGTH( REPLACE ( zdjsgh, ';', '' ) ) + 1 )
) t
) a GROUP BY a.xnzydm
</select>
<select id="getJsJzjsList" resultType="org.jeecg.modules.tjbb.tjbbSf8.entity.TjbbSf8">
select a.xnzydm,count(a.xnzydm) as count from (
select a.xnzydm,count(a.xnzydm) as count from
(
select distinct * from (
SELECT
distinct
xnzydm,
SUBSTRING_INDEX( SUBSTRING_INDEX( skjsgh, ';', n ), ';', - 1 ) AS zdjsgh
FROM
tjbb_sf6,
( SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, tjbb_sf6 ) x
WHERE
1 = 1
AND n &lt;= ( LENGTH( skjsgh ) - LENGTH( REPLACE ( skjsgh, ';', '' ) ) + 1 )
union all
SELECT
distinct
xnzydm,
SUBSTRING_INDEX( SUBSTRING_INDEX( zdjsgh, ';', n ), ';', - 1 ) AS zdjsgh
FROM
tjbb_sf8,
( SELECT @rownum := @rownum + 1 AS n FROM ( SELECT @rownum := 0 ) r, tjbb_sf8 ) x
( SELECT @rownum1 := @rownum1 + 1 AS n FROM ( SELECT @rownum1 := 0 ) r, tjbb_sf8 ) x
WHERE
1 = 1
AND n &lt;= ( LENGTH( zdjsgh ) - LENGTH( REPLACE ( zdjsgh, ';', '' ) ) + 1 )
) a , (select * from tjbb_153 where gzdwlb = '基础教育学校' and rzzt = '在聘') b
) t
) a, (select * from tjbb_153 where gzdwlb = '基础教育学校' and rzzt = '在聘') b
where a.zdjsgh = b.gh
GROUP BY a.xnzydm
</select>

2
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/jeecg/jeecg_config.properties
View File

@ -1,7 +1,7 @@
#code_generate_project_path
project_path=E:\\workspace\\jeecg-boot
#bussi_package[User defined]
bussi_package=org.jeecg.modules.demo
bussi_package=org.jeecg.modules.tjbb
#default code path

5174
jeecgboot-vue3/pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff