质检附表

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

@@ -883,6 +883,10 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             if(!tec.isNew) {
                 summaryPre(tec);
             }
+            /*检验单或者评定表的实测值元素都要去空*/
+            tec.getTableAll().stream().filter(e->e.getTableType().equals(5)||e.getTableType().equals(1)).findFirst().ifPresent(x->{
+                tec.getFormDataMap().values().stream().filter(e->x.getInitTableName().equals(e.getTableName())&&e.getCoordsList().size()>1).forEach(fd->fd.setIsRemoveEmpty(true));
+            });
         }catch (Exception e){
             e.printStackTrace();
         }
@@ -958,7 +962,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                 /*假如是直接取数，则补充上非空过滤,排除元素自我引用情况*/
                 if(StringUtils.isNotEquals(fd.getCode(),fd.getFormula().getRely())&&tmp.matches("^E\\[m_\\d{14}_\\d{19}:key_\\d{0,3}]$")){
                     tmp="FC.removeEmpty("+tmp+")";
-                }else if(!tmp.contains("removeEmpty")){
+                }else if(StringUtils.isEquals(fd.getCode(),fd.getFormula().getRely())&&!tmp.contains("removeEmpty")){
                     /*如果不用去空公式，且元素自我引用就可以视为手填*/
                     fd.setIsRemoveEmpty(false);
                 }