计量公式/平曲线前缀保存

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

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

blade-service/blade-business/src/main/java/org/springblade/business/controller/MileageController.java

@@ -153,6 +153,13 @@ public class MileageController {
     @GetMapping("/list")
     public R<IPage<Mileagexy>> page(Long partId, Query query) {
         IPage<Mileagexy> pages = service.page(Condition.getPage(query), Wrappers.<Mileagexy>lambdaQuery().eq(Mileagexy::getPartId, partId));
+        List<Mileagexy> list = pages.getRecords();
+        if(Func.isNotEmpty(list)&&list.stream().anyMatch(e->Func.isEmpty(e.getPartNo()))){
+          MileagePart part= this.partService.getById(list.get(0).getPartId());
+          if(part!=null&&Func.isNotEmpty(part.getPrefix())) {
+              list.forEach(e -> e.setPartNo(part.getPrefix()));
+          }
+        }
         return R.data(pages);
     }
 

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

@@ -9,6 +9,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.manager.dto.ElementData;
 import org.springblade.manager.dto.FormData;
+import org.springblade.manager.dto.TreeNode;
 import org.springblade.manager.formula.FormulaExecutor;
 import org.springblade.manager.vo.*;
 import org.springframework.beans.BeanUtils;
@@ -537,8 +538,17 @@ public class ExecutorSpecial extends FormulaExecutor {
         @Override
         public void parse() {
             /*按照计量单元和单元内的清单顺序排序显示计量清单，并且把计量单元的层级一并显示*/
-            /*根据每一期的支付信息，获取对应的计量清单，然后根据清单Id配合s_inventory_form_meter查找计量单元信息*/
+            /*根据每一期的s_middle_meter_apply，s_inventory_form_apply 获取对应的计量清单，然后根据清单Id配合s_inventory_form_meter查找计量单元信息*/
             /*s_change_token_inventory每个清单关联的变更令，s_change_token_meter每个计量单元关联的变更令*/
+            try {
+                Map<Long, TreeNode<MeterTree>> treeNodeMap = tec.getMeterTreeMap().get();
+                List<TreeNode<MeterTree>> treeNodeList= new ArrayList<>();
+                current.forEach(e->{
+                    treeNodeList.add(treeNodeMap.get(e.getMeterId()));
+                });
+            }catch (Exception e){
+                e.printStackTrace();
+            }
 
         }
     }

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

@@ -90,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.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;
+            String paySql="select a.form_number number,a.form_name name ,a.current_meter_total completed ,current_meter_money money ,contract_meter_id meterId,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));
         };
     }