合同材料名称不显示

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/BusInfo.java

@@ -0,0 +1,13 @@
+package org.springblade.manager.vo;
+
+import lombok.Data;
+
+/**
+ * @author yangyj
+ * @Date 2024/5/15 16:29
+ * @description 集中存放business相关数据
+ */
+@Data
+public class BusInfo {
+    BaseInfo baseInfo;
+}

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/vo/ContractMaterialVO.java

@@ -35,5 +35,9 @@ public class ContractMaterialVO extends ContractMaterial {
 	private static final long serialVersionUID = 1L;
 
 
+	public String getNodeName() {
+		return getMaterialName();
+	}
+
 
 }

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

@@ -1,8 +0,0 @@
-package org.springblade.manager.formula;
-
-/**
- * @author yangyj
- */
-public interface IFcHandler {
-    void execute();
-}

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

@@ -308,6 +308,7 @@ public class ExecutorMeter extends FormulaExecutor {
 
         @Override
         public void parse() {
+            builderFormDatas(MaterialPriceDifferential.class);
             /*本期材料*/
             materials=tec.meterInfo.getMaterialsAll().stream().filter(e->tec.getPeriodId().equals(e.getPeriodId())).collect(Collectors.toList());
             if(materials.size()>0){
@@ -927,7 +928,7 @@ public class ExecutorMeter extends FormulaExecutor {
                 /* 本期末累计支付金额占合同比*/
                 sis.setPayPercent(ratioFc.apply(sis.getCurrentPeriodEndPay(),sis.getChangeMoney()));
                 /**上期末占合合同金额*/
-                sis.setPayPercent(ratioFc.apply(subtractFc.apply(sis.getCurrentPeriodEndPay(),sis.getCurrentPeriodPay()),sis.getContractMoney()));
+                sis.setPrePayPercent(ratioFc.apply(subtractFc.apply(sis.getCurrentPeriodEndPay(),sis.getCurrentPeriodPay()),sis.getContractMoney()));
                 /*变更金额*/
                 sis.setChangeMoneyAll(subtractFc.apply(sis.getChangeMoney(),sis.getContractMoney()));
                 /*变更金额*/

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

@@ -122,6 +122,8 @@ public class TableElementConverter implements ITableElementConverter {
     private List<ReportResult> reportResults ;
     /**repeat 公共元素标记:有部分元素是每种表每页都相同的内容*/
     private Set<String> repeatKeys=new HashSet<>();
+    /**集中存放business相关数据*/
+    public BusInfo busInfo=new BusInfo();
     /**用来集中存放计量相关的数据*/
     public MeterInfo meterInfo = new MeterInfo();
     /**取小数*/

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

@@ -1052,6 +1052,8 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
             /*天气*/
             weather(tec);
         }
+      /*  LinkedHashMap<String, FormData> baseMap = FormulaUtils.toFormDataMap(tec.busInfo.getBaseInfo());
+        tec.formDataMap.putAll(baseMap);*/
         /*通用计算*/
         generalCalc(tec);
         if(ExecuteType.INSPECTION.equals(tec.getExecuteType())) {

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MaterialStartStatementController.java

@@ -54,7 +54,7 @@ public class MaterialStartStatementController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入materialStartStatement,type:1材料2开工")
 	public R addOrUpdate(@Valid @RequestBody MaterialStartStatement materialStartStatement) {
 		materialStartStatementService.addOrUpdate(materialStartStatement);
-		taskController.calculate(materialStartStatement.getId().toString(),1);
+		taskController.calculate(materialStartStatement.getId().toString(),materialStartStatement.getType());
 		return R.success("操作成功");
 	}