公式相关

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

@@ -3,29 +3,23 @@ package com.mixsmart.utils;
 
 import cn.hutool.core.date.*;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.HashUtil;
+
 import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.RadixUtil;
-import cn.hutool.dfa.SensitiveUtil;
-import com.alibaba.fastjson.JSON;
+
 import com.jfireel.expression.Expression;
 import com.jfireel.expression.node.CalculateNode;
-import com.jfireel.expression.node.impl.CompileObjectMethodNode;
 import com.jfireel.expression.node.impl.OperatorResultNode;
 import com.jfireel.expression.node.impl.StaticObjectMethodNode;
 import com.jfireel.expression.node.impl.VariableNode;
 import com.jfireel.expression.token.Token;
-import com.jfireel.expression.token.TokenType;
 import org.apache.commons.collections4.MapUtils;
-import org.apache.poi.ss.formula.functions.T;
-import org.checkerframework.checker.units.qual.A;
+
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 import org.springblade.core.tool.utils.*;
-import org.springblade.manager.dto.ElementData;
-import org.springblade.manager.vo.AppWbsTreeContractVO;
+
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -33,16 +27,11 @@ import java.io.FileNotFoundException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
 import java.util.*;
-import java.util.function.BinaryOperator;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
 
 import static java.math.BigDecimal.ROUND_CEILING;
 import static java.math.BigDecimal.ROUND_HALF_UP;

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

@@ -157,8 +157,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                         String name = StringUtils.handleNull(m.get("name"));
                         if(name.contains("实测值")&&name.contains("偏差值")){
                             String ekey = StringUtils.handleNull(m.get("tableName"))+":"+StringUtils.handleNull(m.get("ekey"));
+                            cki.add(ekey);
                             if(this.formDataMap.values().stream().map(FormData::getCode).noneMatch(k->StringUtils.isEquals(k,ekey))){
-                                cki.add(ekey);
                                 missingList.add(ekey);
                             }
                         }
@@ -169,8 +169,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                         String name = StringUtils.handleNull(m.get("name"));
                         if(name.contains("检验日期")){
                             String ekey = StringUtils.handleNull(m.get("tableName"))+":"+StringUtils.handleNull(m.get("ekey"));
+                            ckd.set(ekey);
                             if(!this.formDataMap.containsKey(ekey)&&this.formDataMap.values().stream().map(FormData::getCode).noneMatch(k->StringUtils.isEquals(k,ekey))){
-                                ckd.set(ekey);
                                 missingList.add(ekey);
                             }
                         }
@@ -533,6 +533,10 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
                             if(fd.getCoordsList().size()>1&&f.split("[/+\\-*]").length>1){
                                 LinkedHashMap<String,FormData> fdMap =new LinkedHashMap<>();
                                 ele.forEach(e->{
+                                    /*步进处理*/
+                                    if(e.getCode().equals("m_20220928135543_1575001284954554368:key_31")){
+                                        e.setStep(10);
+                                    }
                                     fdMap.put(e.getCode(),e);
                                 });
                                 CompositeDataAccess cda = new CompositeDataAccess(fdMap);

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

@@ -81,6 +81,7 @@ public class WbsParamServiceImpl extends BaseServiceImpl<WbsParamMapper, WbsPara
             }
             nodes.add(wbsTreeContract);
         }
+        Collections.reverse(nodes);
         return nodes;
     }