Jelajahi Sumber

计量混凝土节点显示后管配置比例

qianxb 1 tahun lalu
induk
melakukan
2ffc1d77db

+ 10 - 0
blade-service/blade-meter/src/main/java/org/springblade/meter/controller/MeterTreeController.java

@@ -59,6 +59,8 @@ public class MeterTreeController extends BladeController {
     private final DataSourceTransactionManager transactionManager;
     private final IMeterTreeLinkWbsTreeService meterTreeLinkWbsTreeService;
     private final IMiddleMeterApplyService middleMeterApplyService;
+    private final MeterContractInfoService meterContractInfoService;
+
 
     @GetMapping("/template/detail")
     @ApiOperationSupport(order = 1)
@@ -709,6 +711,14 @@ public class MeterTreeController extends BladeController {
         MeterTreeContractVO vo =  meterTreeContractService.contractDetail(id);
         //判断是否是最底层
         if (vo.getChildTotal() == 0) {
+            //设置强度
+            MeterContractInfo contract = meterContractInfoService.getOne(
+                    new LambdaQueryWrapper<MeterContractInfo>().eq(MeterContractInfo::getContractId,vo.getContractId()));
+            if (contract == null){
+                return R.fail("未获取到合同段信息");
+            }
+            vo.setSevenRatio(contract.getSevenRatio());
+            vo.setTwentyEightRatio(contract.getTwentyEightRatio());
             //设置清单
             List<ContractFromVO> contrFormAllByContrId = contractInventoryFormService.getNodeResolveForm(vo.getContractId(), vo.getId());
             vo.setDecompositionList(contrFormAllByContrId);