试验-保存

1、细集料筛分生成图表 数据过滤

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

@@ -5174,7 +5174,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                     for (int i = 0; i < partition1.size(); i++) {
                         List<String> strings = partition1.get(i);
                         //按组取获取数据
-                        List<FormData> target1 = getFormDataByCode(StringUtils.join( strings,","), tec);
+                        List<FormData> target1 = getFormDataByCode(StringUtils.join( strings,","), tec, null);
                         //全部都能获取到数据
                         if(target1.size() == strings.size()){
                             target.addAll(target1);
@@ -5890,6 +5890,22 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         return target;
     }
 
+    /**
+     * 细集料图表获取数据单独调整 排除空数据和/数据
+     * */
+    public List<FormData> getFormDataByCode(String codes, TableElementConverter tec , String key) {
+        List<FormData> target = new ArrayList<>();
+        String[] tfa = codes.split(",");
+        for (String code : tfa) {
+            code = code.replace("E['", "").replace("']", "");
+            FormData fdt = tec.formDataMap.get(code);
+            if (fdt != null && CollectionUtil.isNotEmpty(fdt.getValues()) && !Objects.equals(fdt.getValues().get(0).getValue(),"/")) {
+                target.add(fdt);
+            }
+        }
+        return target;
+    }
+
     @Override
     public Map<String, Object> getElementInfoByCodes(String codes) {
         final String ekey = "ekey";