计量公式\节点公式bug

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

@@ -11,6 +11,8 @@ import java.math.BigDecimal;
  */
 @Data
 public class Payment {
+    /**计量清单id*/
+    private Long  formId;
     /**清单编号*/
     private String number;
     /**清单名称*/

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

@@ -536,6 +536,9 @@ public class ExecutorSpecial extends FormulaExecutor {
 
         @Override
         public void parse() {
+            /*按照计量单元和单元内的清单顺序排序显示计量清单，并且把计量单元的层级一并显示*/
+            /*根据每一期的支付信息，获取对应的计量清单，然后根据清单Id配合s_inventory_form_meter查找计量单元信息*/
+            /*s_change_token_inventory每个清单关联的变更令，s_change_token_meter每个计量单元关联的变更令*/
 
         }
     }

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

@@ -4,6 +4,7 @@ import com.mixsmart.utils.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.manager.dto.TreeNode;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.ProjectInfo;
 import org.springblade.manager.entity.TrialSelfDataRecord;
@@ -89,7 +90,7 @@ public class FormulaDaoImpl implements IFormulaDao {
     @Override
     public Function<Long, List<Payment>> getPaymentListFc() {
         return contractId->{
-            String paySql="select a.form_number number,a.form_name name ,a.current_meter_total completed ,current_meter_money money ,b.chapter_number chapter, b.contract_money contractMoney,b.change_money,b.unit,contract_total ,change_total,c.sort,c.id periodId from s_inventory_form_apply a join s_contract_inventory_form b on a.contract_form_id=b.id join s_contract_meter_period c on a.contract_period_id=c.id where a.is_deleted=0 and a.approve_status=2 and a.contract_id="+contractId;
+            String paySql="select a.form_number number,a.form_name name ,a.current_meter_total completed ,current_meter_money money ,b.id formId,b.chapter_number chapter, b.contract_money contractMoney,b.change_money,b.unit,contract_total ,change_total,c.sort,c.id periodId from s_inventory_form_apply a join s_contract_inventory_form b on a.contract_form_id=b.id join s_contract_meter_period c on a.contract_period_id=c.id where a.is_deleted=0 and a.approve_status=2 and a.contract_id="+contractId;
             return this.jdbcTemplate.query(paySql,new BeanPropertyRowMapper<>(Payment.class));
         };
     }

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

@@ -1436,7 +1436,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
     public  void write(TableElementConverter tec,FormData fd,Object data){
         if(!tec.force&&fd.executable()&&fd.getFormula().getFormula().contains(WP)){
             /*非强制刷新模式下，节点参数公式已经生成过就自动填充且不会覆盖已经存在的内容*/
-            if(StringUtils.isNotEmpty(data)&&!fd.empty()){
+            if(StringUtils.isNotEmpty(data)){
                 for(ElementData ed:fd.getValues()){
                     if(ed.isEmpty()) {
                         ed.setValue(data);