Merge remote-tracking branch 'origin/master' into master

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -817,9 +817,9 @@
         </foreach>
     </select>
     <select id="getSelectNodes" resultType="org.springblade.manager.vo.WbsTreePrivateVO6">
-        select *,ifnull((select count(1) from m_wbs_tree_private wtp2 where wtp2.parent_id = wtp.id and project_id = #{projectId}),0) as formCount,
+        select *,ifnull((select count(1) from m_wbs_tree_private wtp2 where wtp2.parent_id = wtp.id and wtp2.is_deleted = 0 and project_id = #{projectId}),0) as formCount,
                (select  GROUP_CONCAT(id)
-                from m_wbs_tree_private wtp3 WHERE wtp3.parent_id = wtp.id and project_id = #{projectId}) as formIds
+                from m_wbs_tree_private wtp3 WHERE wtp3.parent_id = wtp.id  and wtp3.is_deleted = 0 and project_id = #{projectId}) as formIds
         from m_wbs_tree_private  wtp where p_key_id in
         <foreach collection="ids" item="id" open="(" close=")" separator=",">
             #{id}

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);

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/ContractInventoryFormServiceImpl.java

@@ -326,18 +326,18 @@ public class ContractInventoryFormServiceImpl extends BaseServiceImpl<ContractIn
         //查询下级节点集合,并统计合同金额，变更后金额
         List<ContractInventoryFormVO> list = baseMapper.getChildList(id,vo.getContractId());
         //统计合同金额，变更后金额给当前节点设置
-        BigDecimal contractTotal = new BigDecimal(0);
-        BigDecimal changeTotal = new BigDecimal(0);
+        BigDecimal contractMoney = new BigDecimal(0);
+        BigDecimal changeMoney = new BigDecimal(0);
         for (ContractInventoryFormVO formVO : list) {
             if (formVO.getContractMoney() != null){
-                contractTotal = changeTotal.add(formVO.getContractMoney());
+                contractMoney = contractMoney.add(formVO.getContractMoney());
             }
             if (formVO.getChangeMoney() != null){
-                changeTotal = changeTotal.add(formVO.getChangeMoney());
+                changeMoney = changeMoney.add(formVO.getChangeMoney());
             }
         }
-        vo.setContractMoney(contractTotal);
-        vo.setChangeMoney(changeTotal);
+        vo.setContractMoney(contractMoney);
+        vo.setChangeMoney(changeMoney);
         vo.setList(list);
         return vo;
     }