proportion优良合格/

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ReportResult.java

@@ -43,6 +43,8 @@ public class ReportResult {
     private Map<String,Object> commonData =new HashMap<>();
     /**电签信息*/
     private Map<String,String> eSignMap = new HashMap<>();
+    /**合并单元格*/
+    private Map<String,String> mergeCellsMap = new HashMap<>();
     /**模板类型*/
     private Integer modelType=MeterInfo.MB_GX;
 

blade-service/blade-manager/src/main/java/com/mixsmart/utils/CustomFunction.java

@@ -537,12 +537,16 @@ public class CustomFunction {
      **/
     public static Object proportion(List<Object> data, String cp) {
         if (Func.isNotEmpty(data) && Func.isNotBlank(cp)) {
-            data = data.stream().filter(Func::isNotEmpty).map(e -> e.toString().replaceAll("\\s+", "")).collect(Collectors.toList());
+            data = data.stream().filter(Func::isNotEmpty).map(e -> e.toString().replaceAll("\\s+", "")).filter(s->!RegexUtil.match("/+",s)).collect(Collectors.toList());
             return StringUtils.number2String(100 * ((double) data.stream().filter(e -> StringUtils.isEquals(e, cp)).count()) / (double) data.size(), 1);
         }
         return "";
     }
 
+/*    public static void main(String[] args) {
+        List<Object> list = Arrays.asList("优良","优良","优良","/");
+        System.out.println(proportion(list,"优良"));
+    }*/
 
     public static Object goodSize(List<Object> data, String cp) {
         if (Func.isNotEmpty(data) && Func.isNotBlank(cp)) {

blade-service/blade-manager/src/main/java/org/springblade/manager/formula/impl/MeterElementWriter.java

@@ -11,6 +11,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.DoubleStream;
 import java.util.stream.IntStream;
 
 /**
@@ -29,6 +30,7 @@ public class MeterElementWriter implements ElementWriter {
         try {
             /*写入前清空内容*/
             clear(fd);
+            /*原素数据一律用List集合表示*/
             List<Object> values = toList(data,containsNull);
             /*计量写入数据无效考虑是否存在表页实体，也就不存在超页的概念，只管按需自动增页写人，任何元素初始化都是一页*/
             int capacity=fd.getCoordsList().size();

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -23,6 +23,7 @@ import org.apache.commons.lang.time.DateUtils;
 import org.apache.poi.hssf.usermodel.HSSFFont;
 import org.apache.poi.hssf.usermodel.HSSFRichTextString;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.usermodel.XSSFRichTextString;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;