公式相关

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/RangeInfo.java

@@ -31,7 +31,7 @@ public class RangeInfo {
     private String key;
     @ApiModelProperty("表节点的唯一id")
     private Long pkId;
-    @ApiModelProperty("不合格数量，也可以用百分比表示如2%")
+    @ApiModelProperty("合格数量，也可以用百分比表示如2%")
     private String fail;
     @ApiModelProperty("容量")
     private Integer capacity;

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/FormulaController.java

@@ -235,7 +235,7 @@ public class FormulaController {
                 System.out.println("获取元素定位失败");
                 keymap.put(info.getKey(),bak);
             }
-            List<Object> data = CustomFunction.b445random(info.getSize(),info.getDesign(),info.getDev(),info.getFail(),1);
+            List<Object> data = CustomFunction.b445random(info.getSize(),info.getDesign(),info.getDev(),Func.toInt(info.getSize())-Func.toInt(info.getFail()),1);
             String[] dw = keymap.get(info.getKey()).split(StringPool.SEMICOLON);
             Map<String,Object> result = new HashMap<>(dw.length*2);
             if(dw.length==1){

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

@@ -76,6 +76,16 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
     @Override
     public List<WbsTreeVO2> tree(String wbsId, String tenantId, String type) {
+        boolean fi;
+        do{
+            WbsTreePrivate   wbsTreePrivate= this.wbsTreePrivateService.getOne(Wrappers.<WbsTreePrivate>lambdaQuery().eq(WbsTreePrivate::getPKeyId,wbsId));
+            if(wbsTreePrivate!=null){
+                fi=true;
+                wbsId=wbsTreePrivate.getWbsId();
+            }else{
+                fi=false;
+            }
+        }while (fi);
         List<WbsTreeVO2> wbsTreeVO2s = baseMapper.tree2(wbsId, tenantId, type);
         if (wbsTreeVO2s.size() > 0) {
             return buildWbsTreeByStream(wbsTreeVO2s);