From 4d48476bdc24dbb487f6a0d6bf594b1952a163ef Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Sat, 28 Jan 2023 17:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B4=B9=E7=94=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=8A=B6=E6=80=81=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bms/controller/BmsRegion2Controller.java  | 30 ++++++++++---------
 .../service/TbsBudgetApplicationService.java  | 15 ++++++++--
 .../impl/VtbVerificationServiceImpl.java      |  9 ++++++
 3 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java
index aaa32be7..9a58b975 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java
+++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java
@@ -74,21 +74,23 @@ public class BmsRegion2Controller {
             List<BmsRegion2> list2 = listMap.get(2)==null?new ArrayList<>():listMap.get(2);
             List<BmsRegion2> list3 = listMap.get(3)==null?new ArrayList<>():listMap.get(3);
             List<BmsRegion2> list4 = listMap.get(3)==null?new ArrayList<>():listMap.get(4);
-            list4.forEach(obj4->{
-                boolean exist = false;
-                for (BmsRegion2 obj3 : list3) {
-                    if(obj3.getId().equals(obj4.getPid())){
-                        List<BmsRegion2> childList = obj3.getChildNodes()==null?new ArrayList<>():obj3.getChildNodes();
-                        childList.add(obj4);
-                        obj3.setChildNodes(childList);
-                        exist = true;
-                        break;
+            if (list4!=null){
+                list4.forEach(obj4->{
+                    boolean exist = false;
+                    for (BmsRegion2 obj3 : list3) {
+                        if(obj3.getId().equals(obj4.getPid())){
+                            List<BmsRegion2> childList = obj3.getChildNodes()==null?new ArrayList<>():obj3.getChildNodes();
+                            childList.add(obj4);
+                            obj3.setChildNodes(childList);
+                            exist = true;
+                            break;
+                        }
                     }
-                }
-                if(!exist){
-                    list3.add(obj4);
-                }
-            });
+                    if(!exist){
+                        list3.add(obj4);
+                    }
+                });
+            }
             list3.forEach(obj3->{
                 boolean exist = false;
                 for (BmsRegion2 obj2 : list2) {
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
index 2ab88075..0356a0a2 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
@@ -58,12 +58,21 @@ public class TbsBudgetApplicationService {
         //预算
         List<Long> budgetIds = budgetCostItems.stream().map(TbsBudgetCostItem::getBudgetId)
                 .distinct().collect(Collectors.toList());
-        List<TbsBudget> budgetList = tbsBudgetMapper.selectBatchIds(budgetIds);
+        List<TbsBudget> budgetList;
+        if(CollectionUtil.isNotEmpty(budgetIds)){
+            budgetList = tbsBudgetMapper.selectBatchIds(budgetIds);
+        }else {
+            budgetList = new ArrayList<>();
+        }
 
         List<Long> budgetItemIds = budgetCostItems.stream().map(TbsBudgetCostItem::getScheduleItemBudgetId)
                 .distinct().collect(Collectors.toList());
-        List<TbsScheduleItemBudget> scheduleItemList = tbsScheduleItemBudgetService.listByIds(budgetItemIds);
-
+        List<TbsScheduleItemBudget> scheduleItemList;
+        if(CollectionUtil.isNotEmpty(budgetItemIds)){
+            scheduleItemList = tbsScheduleItemBudgetService.listByIds(budgetItemIds);
+        }else {
+            scheduleItemList = new ArrayList<>();
+        }
         TbsBudgetTableVo tableVo = new TbsBudgetTableVo();
         List<TbsBudgetTableVo.TopTheadHeader> topTheadHeaders = new ArrayList<>();
         Map<Long,List<TbsBudgetCostItem>> tmpMap = budgetCostItems.stream().collect(Collectors.groupingBy(TbsBudgetCostItem::getScheduleItemBudgetId));
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
index 37148c53..7ec8a2cf 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
@@ -283,6 +283,15 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         activityParam.setId(activity.getId());
         activityParam.setActivityState(TbsActivityState.STATE_1_Checking);
         activityService.updateById(activityParam);
+        //计算费用申请是否完成
+        BigDecimal totalCostApplyUsed = costApply.getTotalActivityUsedAmount().add(totalAmount);
+        TbsCostApply updCost = new TbsCostApply();
+        updCost.setId(costApply.getId());
+        updCost.setTotalActivityUsedAmount(totalCostApplyUsed);
+        if(costApply.getTotalActivityAmount().compareTo(totalCostApplyUsed)<=0){
+            updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode());
+        }
+        costApplyService.updateById(updCost);
     }
 
     /**