元素参数调整

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

@@ -196,7 +196,7 @@ public class WbsTreeController extends BladeController {
     @ApiOperationSupport(order = 8)
     @ApiOperation(value = "根据表单id查询所有元素", notes = "传入表单id")
     @ApiImplicitParam(name = "id", value = "表单id", required = true)
-    public R<List<WbsFormElementVO>> selectFormElements(@RequestParam("id") String id) {
+    public R<List<WbsFormElementVO>> selectFormElements(@RequestParam("id") String id,Long nodeId) {
         List<WbsFormElementVO> wbsFormElements = null;
         if (StringUtils.isNotEmpty(id)) {
             wbsFormElements = wbsTreeService.selectFormElements(id);

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

@@ -202,7 +202,6 @@ public class TurnPointCalculator implements ITurnPointCalculator {
             levelInfo.setDx("-6,6");
         }
         String dx;
-//        double cD=Double.parseDouble(step.toString());
         double min=0.5d;
         do{
             dx= CustomFunction.rangeList(1,0,levelInfo.getDx(),1,0,1).get(0).toString();
@@ -214,7 +213,6 @@ public class TurnPointCalculator implements ITurnPointCalculator {
             if(hd>min&&hd<levelInfo.getStep()){
                 hasNp=false;
             }
-//            np.setSc(StringUtils.handleNull(gc));
         }
         if(StringUtils.isNotEmpty(np.getSc())&&StringUtils.isEmpty(np.getQ(),np.getSj())){
             /*010*/
@@ -228,10 +226,8 @@ public class TurnPointCalculator implements ITurnPointCalculator {
             }
         }else if(StringUtils.isNotEmpty(np.getSc(),np.getQ())&&StringUtils.isEmpty(np.getSj())){
             /*110*/
-//            np.setQ(qs.toString());
         }else if(StringUtils.isNotEmpty(np.getSj())&&StringUtils.isEmpty(np.getSc(),np.getQ())){
             /*001*/
-//            np.setSj(sj.toString());
             np.setSc(StringUtils.number2String(Double.parseDouble(np.getSj())+Double.parseDouble(dx)/1000,3));
             hd=levelInfo.getSightHeight()-Double.parseDouble(np.getSc());
             if(hd>min&&hd<levelInfo.getStep()){
@@ -242,16 +238,11 @@ public class TurnPointCalculator implements ITurnPointCalculator {
             }
         }else if(StringUtils.isNotEmpty(np.getQ(),levelInfo.getSightHeight())&&StringUtils.isEmpty(np.getSc(),np.getSj())){
             /*100*/
-//            np.setQ(qs.toString());
             np.setSc(StringUtils.number2String(levelInfo.getSightHeight()-Double.parseDouble(np.getQ()),3));
         }else if(StringUtils.isNotEmpty(np.getQ(),np.getSj())&&StringUtils.isEmpty(np.getSc())){
             /*101*/
-//            np.setQ(qs.toString());
             np.setSc(StringUtils.number2String(Double.parseDouble(np.getSj())+Double.parseDouble(dx)/1000,3));
         }else if(StringUtils.isNotEmpty(np.getQ(),np.getSc(),np.getSj())){
-            /*111*/
-//            np.setQ(qs.toString());
-//            np.setSc(gc.toString());
         }
     }
 

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

@@ -316,16 +316,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             if (escapeChar != null) {
                 elements.setEAllowDeviation(escapeChar);
             }
-//            //是否保存过公式
-//            List<Formula> formulas = formulaMapper.selectList(Wrappers.<Formula>query().lambda()
-//                    .eq(Formula::getElementId, elements.getId())
-//                    .eq(Formula::getStatus, 1)
-//            );
-//            if (formulas.size() > 0) {
-//                elements.setIsSaveFormula(1);
-//            } else {
-//                elements.setIsSaveFormula(0);
-//            }
         });
 
              String elementIds = wbsFormElements.stream().map(WbsFormElement::getId).map(String::valueOf).collect(Collectors.joining(","));