diff --git a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
index f3ff51e..aa196a2 100644
--- a/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
+++ b/jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
@@ -200,4 +200,45 @@ public class JeecgController<T, S extends IService<T>> {
         }
         return Result.error("文件导入失败！");
     }
+
+    protected Result<?> importExcel2(HttpServletRequest request, HttpServletResponse response, Class<T> clazz) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            // 获取上传文件对象
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(0);
+//            params.setHeadRows(0);
+            params.setNeedSave(true);
+            try {
+                List<T> list = ExcelImportUtil.importExcel(file.getInputStream(), clazz, params);
+                //update-begin-author:taoyan date:20190528 for:批量插入数据
+                long start = System.currentTimeMillis();
+                service.saveBatch(list);
+                //400条 saveBatch消耗时间1592毫秒  循环插入消耗时间1947毫秒
+                //1200条  saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
+                log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
+                //update-end-author:taoyan date:20190528 for:批量插入数据
+                return Result.ok("文件导入成功！数据行数：" + list.size());
+            } catch (Exception e) {
+                //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示
+                String msg = e.getMessage();
+                log.error(msg, e);
+                if(msg!=null && msg.indexOf("Duplicate entry")>=0){
+                    return Result.error("文件导入失败:有重复数据！");
+                }else{
+                    return Result.error("文件导入失败:" + e.getMessage());
+                }
+                //update-end-author:taoyan date:20211124 for: 导入数据重复增加提示
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.error("文件导入失败！");
+    }
 }
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbb16/controller/TjbbController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbb16/controller/TjbbController.java
index 171ed77..aca4d56 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbb16/controller/TjbbController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/tjbb/tjbb16/controller/TjbbController.java
@@ -192,7 +192,7 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","课程与教学");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","1.1");
         objectMap.put("监测指标1","教师教育课程学分");
         objectMap.put("监测指标2","总学分");
         objectMap.put("一级参考标准","总学分≥14学分");
@@ -205,20 +205,20 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","课程与教学");
         objectMap.put("监测指标","2");
         objectMap.put("监测指标1","人文社会与科学素养课程学分占总学分比例");
-        objectMap.put("监测指标2"," ");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≥10%");
         for(Tjbb_141 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("#.00%").format(Double.parseDouble(rwshykxsykc)/Double.parseDouble(xfzj)));
+            objectMap.put(par.getXnzymc(), StringUtils.isEmpty(xfzj)?null:new DecimalFormat("#0.00%").format(Double.parseDouble(rwshykxsykc)/Double.parseDouble(xfzj)));
         }
         pageList.add(objectMap);
 
         objectMap = new HashMap<>();
         objectMap.put("维度","课程与教学");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","2.1");
         objectMap.put("监测指标1","人文社会与科学素养课程学分");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getRwshykxsykc).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -227,9 +227,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","课程与教学");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","2.2");
         objectMap.put("监测指标1","总学分");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getXfzj).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -240,20 +240,20 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","课程与教学");
         objectMap.put("监测指标","3");
         objectMap.put("监测指标1","学科专业课程学分占总学分比例");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≥50%");
         for(Tjbb_141 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("#.00%").format(Double.parseDouble(xkzykc)/Double.parseDouble(xfzj)));
+            objectMap.put(par.getXnzymc(), StringUtils.isEmpty(xfzj)?null:new DecimalFormat("#0.00%").format(Double.parseDouble(xkzykc)/Double.parseDouble(xfzj)));
         }
         pageList.add(objectMap);
 
         objectMap = new HashMap<>();
         objectMap.put("维度","课程与教学");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","3.1");
         objectMap.put("监测指标1","学科专业课程学分");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getXkzykc).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -262,9 +262,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","课程与教学");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","3.2");
         objectMap.put("监测指标1","总学分");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getXfzj).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -275,7 +275,7 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","合作与实践");
         objectMap.put("监测指标","4");
         objectMap.put("监测指标1","教育实践时间");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≥18周");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getJysjsjzj).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -286,7 +286,7 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","合作与实践");
         objectMap.put("监测指标","5");
         objectMap.put("监测指标1","实习生数与教育实践基地数比例");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≤20:1");
 
         List<Tjbb_24> zb24GpzyList = tjbb_24Service.getGroupByCountByXnzydm();
@@ -294,16 +294,16 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
             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)){
-                objectMap.put(par.getXnzymc(), StringUtils.isEmpty(jdzs)?null:new DecimalFormat("#.00%").format(Double.parseDouble(sxss)/Double.parseDouble(jdzs)));
+                objectMap.put(par.getXnzymc(), StringUtils.isEmpty(jdzs)?null:new DecimalFormat("#0.00").format(Double.parseDouble(sxss)/Double.parseDouble(jdzs)));
             }
         }
         pageList.add(objectMap);
 
         objectMap = new HashMap<>();
         objectMap.put("维度","合作与实践");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","5.1");
         objectMap.put("监测指标1","实习生数");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf5List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf5::getCjjysjsfssxzs).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -312,9 +312,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","合作与实践");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","5.2");
         objectMap.put("监测指标1","教育实践基地数");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zb24GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(Tjbb_24::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -329,7 +329,7 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","师资队伍");
         objectMap.put("监测指标","6");
         objectMap.put("监测指标1","生师比");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≤18:1");
         for(Tjbb_141 par : headList){
             String bkss = zb16GpzyList.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
@@ -351,17 +351,17 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
                 if(StringUtils.isEmpty(lxss)){
                     lxss = "0";
                 }
-                Double tj = Double.parseDouble(bkss) + Double.parseDouble(jysss) + Double.parseDouble(jybss) - Double.parseDouble(lxss);
-                objectMap.put(par.getXnzymc(), StringUtils.isEmpty(bzyjss)?null:new DecimalFormat("#.00%").format(tj/Double.parseDouble(bzyjss)));
+                Double tj = Double.parseDouble(bkss) + Double.parseDouble(jysss)*1.5 + Double.parseDouble(jybss)*2 - Double.parseDouble(lxss);
+                objectMap.put(par.getXnzymc(), StringUtils.isEmpty(bzyjss)?null:new DecimalFormat("#0.00").format(tj/Double.parseDouble(bzyjss)));
             }
         }
         pageList.add(objectMap);
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","6.1");
         objectMap.put("监测指标1","专业本科生数");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zb16GpzyList.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -370,9 +370,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","6.2");
         objectMap.put("监测指标1","教育硕士数");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf9GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf9::getSsyjss).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -381,9 +381,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","6.3");
         objectMap.put("监测指标1","教育博士数");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf9GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf9::getBsyjss).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -392,9 +392,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","6.4");
         objectMap.put("监测指标1","留学生数");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf9GpzyList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf9::getBzklxss).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -403,9 +403,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","6.5");
         objectMap.put("监测指标1","本专业专业教师");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zb152GpzyList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -417,7 +417,7 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","师资队伍");
         objectMap.put("监测指标","7");
         objectMap.put("监测指标1","学科课程与教学论教师");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","有");
         pageList.add(objectMap);
 
@@ -428,7 +428,7 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","师资队伍");
         objectMap.put("监测指标","8");
         objectMap.put("监测指标1","具有高级职称教师占专任教师比例");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≥学校平均水平");
         for(Tjbb_141 par : headList){
             String gjzc = zb152GpgjList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
@@ -437,16 +437,16 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
                 if(StringUtils.isEmpty(gjzc)){
                     gjzc = "0";
                 }
-                objectMap.put(par.getXnzymc(),StringUtils.isEmpty(allteacher)?null:new DecimalFormat("#.00%").format(Double.parseDouble(gjzc)/Double.parseDouble(allteacher)));
+                objectMap.put(par.getXnzymc(),StringUtils.isEmpty(allteacher)?null:new DecimalFormat("#0.00").format(Double.parseDouble(gjzc)/Double.parseDouble(allteacher)));
             }
         }
         pageList.add(objectMap);
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","8.1");
         objectMap.put("监测指标1","高级职称教师");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zb152GpgjList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -455,9 +455,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","8.2");
         objectMap.put("监测指标1","本专业专业教师");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zb152GpzyList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -470,25 +470,25 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","师资队伍");
         objectMap.put("监测指标","9");
         objectMap.put("监测指标1","具有硕博士学位教师占专任教师比例");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≥60%");
         for(Tjbb_141 par : headList){
-            String gjzc = zb152GpgjList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
-            String allteacher = zb152SbsList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
+            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)){
-                if(StringUtils.isEmpty(gjzc)){
-                    gjzc = "0";
+                if(StringUtils.isEmpty(sbsTeacher)){
+                    sbsTeacher = "0";
                 }
-                objectMap.put(par.getXnzymc(),StringUtils.isEmpty(allteacher)?null:new DecimalFormat("#.00%").format(Double.parseDouble(gjzc)/Double.parseDouble(allteacher)));
+                objectMap.put(par.getXnzymc(),StringUtils.isEmpty(allteacher)?null:new DecimalFormat("#0.00%").format(Double.parseDouble(sbsTeacher)/Double.parseDouble(allteacher)));
             }
         }
         pageList.add(objectMap);
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","9.1");
         objectMap.put("监测指标1","硕博士学位教师");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zb152SbsList.stream().filter(zb->zb.getRjzydm().equals(par.getXnzydm())).map(Tjbb_152::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -497,17 +497,15 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","9.2");
         objectMap.put("监测指标1","本专业专业教师");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 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);
 
-        //todo 待完善
-
         List<TjbbSf8> zbsf8AllList = tjbbSf8Service.getJsAllList();
         List<TjbbSf8> zbsf8jzjsList = tjbbSf8Service.getJsJzjsList();
 
@@ -516,7 +514,7 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","师资队伍");
         objectMap.put("监测指标","10");
         objectMap.put("监测指标1","中学兼职教师占教师教育课程教师比例");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≥20%");
         for(Tjbb_141 par : headList){
             String jzjss = zbsf8jzjsList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf8::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON));
@@ -525,16 +523,16 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
                 if(StringUtils.isEmpty(jzjss)){
                     jzjss = "0";
                 }
-                objectMap.put(par.getXnzymc(),StringUtils.isEmpty(alljss)?null:new DecimalFormat("#.00%").format(Double.parseDouble(jzjss)/(Double.parseDouble(alljss))));
+                objectMap.put(par.getXnzymc(),StringUtils.isEmpty(alljss)?null:new DecimalFormat("#0.00%").format(Double.parseDouble(jzjss)/(Double.parseDouble(alljss))));
             }
         }
         pageList.add(objectMap);
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","10.1");
         objectMap.put("监测指标1","本专业中学兼职教师");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf8jzjsList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf8::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -543,9 +541,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","师资队伍");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","10.2");
         objectMap.put("监测指标1","本专业教师教育教师");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf8AllList.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf8::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -559,7 +557,7 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","支持条件");
         objectMap.put("监测指标","11");
         objectMap.put("监测指标1","教学日常运行支出占生均拨款总额与学费收入之和的比例");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≥13%");
         for(Tjbb_141 par : headList){
             String jxrcyxzc = zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getJxrcyxzc).collect(Collectors.joining(SymbolConstant.SEMICOLON));
@@ -572,16 +570,16 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
                 if(StringUtils.isEmpty(xfsrzh)){
                     xfsrzh = "0";
                 }
-                objectMap.put(par.getXnzymc(),StringUtils.isEmpty(jxrcyxzc)?null:new DecimalFormat("#.00%").format(Double.parseDouble(jxrcyxzc)/(Double.parseDouble(xfsrzh)+Double.parseDouble(sjbkze))));
+                objectMap.put(par.getXnzymc(),StringUtils.isEmpty(jxrcyxzc)?null:new DecimalFormat("#0.00%").format(Double.parseDouble(jxrcyxzc)/(Double.parseDouble(xfsrzh)+Double.parseDouble(sjbkze))));
             }
         }
         pageList.add(objectMap);
 
         objectMap = new HashMap<>();
         objectMap.put("维度","支持条件");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","11.1");
         objectMap.put("监测指标1","教学日常运行支出");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getJxrcyxzc).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -590,9 +588,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","支持条件");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","11.2");
         objectMap.put("监测指标1","生均拨款总额");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getSjbkze).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -601,9 +599,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","支持条件");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","11.3");
         objectMap.put("监测指标1","学费收入");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getXfsrzh).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -614,16 +612,16 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","支持条件");
         objectMap.put("监测指标","12");
         objectMap.put("监测指标1","生均教学日常运行支出");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准"," ≥学校平均水平");
         pageList.add(objectMap);
 
 
         objectMap = new HashMap<>();
         objectMap.put("维度","支持条件");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","12.1");
         objectMap.put("监测指标1","教学日常运行支出");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getJxrcyxzc).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -632,9 +630,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","支持条件");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","12.2");
         objectMap.put("监测指标1","本科在校生");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zb16GpzyList.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -645,15 +643,15 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","支持条件");
         objectMap.put("监测指标","13");
         objectMap.put("监测指标1","生均教育实践经费");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≥学校平均水平");
         pageList.add(objectMap);
 
         objectMap = new HashMap<>();
         objectMap.put("维度","支持条件");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","13.1");
         objectMap.put("监测指标1","教育实践经费");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbsf3List.stream().filter(zb->zb.getXnzydm().equals(par.getXnzydm())).map(TjbbSf3::getJysjjf).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -662,9 +660,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","支持条件");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","13.2");
         objectMap.put("监测指标1","本科在校生");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zb16GpzyList.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -676,16 +674,16 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","支持条件");
         objectMap.put("监测指标","14");
         objectMap.put("监测指标1","生均教育类纸质图书");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≥30册");
         pageList.add(objectMap);
 
         //模板忽略
         objectMap = new HashMap<>();
         objectMap.put("维度","支持条件");
-        objectMap.put("监测指标","");
-        objectMap.put("监测指标1","");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标","14.1");
+        objectMap.put("监测指标1","生均教育类纸质图书");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","每6个实习生配备中学学科教材≥1套");
         pageList.add(objectMap);
 
@@ -694,7 +692,7 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","支持条件");
         objectMap.put("监测指标","15");
         objectMap.put("监测指标1","微格教学、语言技能、书写技能、学科实验教学实训室等教学设施");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","有");
         pageList.add(objectMap);
 
@@ -704,7 +702,7 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
         objectMap.put("维度","学生发展");
         objectMap.put("监测指标","16");
         objectMap.put("监测指标1","教师资格证比例");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","≥75%");
         for(Tjbb_141 par : headList){
             String jszgz = zbSf11List.stream().filter(zb->zb.getXnzymc().equals(par.getXnzymc())).map(TjbbSf11::getJszgz).collect(Collectors.joining(SymbolConstant.SEMICOLON));
@@ -713,16 +711,16 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
                 if(StringUtils.isEmpty(bjyrs)){
                     bjyrs = "0";
                 }
-                objectMap.put(par.getXnzymc(),StringUtils.isEmpty(jszgz)?null:new DecimalFormat("#.00%").format(Double.parseDouble(jszgz)/Double.parseDouble(bjyrs)));
+                objectMap.put(par.getXnzymc(),StringUtils.isEmpty(jszgz)?null:new DecimalFormat("#0.00%").format(Double.parseDouble(jszgz)/Double.parseDouble(bjyrs)));
             }
         }
         pageList.add(objectMap);
 
         objectMap = new HashMap<>();
         objectMap.put("维度","学生发展");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","16.1");
         objectMap.put("监测指标1","取得教师资格证人数");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zbSf11List.stream().filter(zb->zb.getXnzymc().equals(par.getXnzymc())).map(TjbbSf11::getJszgz).collect(Collectors.joining(SymbolConstant.SEMICOLON)));
@@ -731,9 +729,9 @@ public class TjbbController extends JeecgController<Tjbb_16, ITjbb_16Service> {
 
         objectMap = new HashMap<>();
         objectMap.put("维度","学生发展");
-        objectMap.put("监测指标","");
+        objectMap.put("监测指标","16.2");
         objectMap.put("监测指标1","毕业生人数");
-        objectMap.put("监测指标2","");
+        objectMap.put("监测指标2","-");
         objectMap.put("一级参考标准","");
         for(Tjbb_141 par : headList){
             objectMap.put(par.getXnzymc(),zb16Bjy.stream().filter(zb->zb.getXnzydldm().equals(par.getXnzydm())).map(Tjbb_16::getCount).collect(Collectors.joining(SymbolConstant.SEMICOLON)));