From d0c1397a4eb0b00766bea464a2d17f80d655d10b Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 10 Aug 2023 17:41:09 +0800
Subject: [PATCH] debug

---
 .../seeyon/service/impl/CommonCheckServiceImpl.java       | 8 ++++----
 .../modules/tbs/service/TbsBudgetMatchApplication.java    | 2 +-
 src/main/resources/mapper/seeyon/CommonCheckMapper.xml    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java b/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java
index f1166fcc..c2491abd 100644
--- a/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java
@@ -102,7 +102,7 @@ public class CommonCheckServiceImpl implements CommonCheckService {
         if(CollUtil.isNotEmpty(policyToDo)){
             List<String> ids = getTodoIds(policyToDo);
             List<TzcPolicy> dataList = tzcPolicyMapper.selectBatchIds(ids);
-            for (TodoVO todoVO : costToDo) {
+            for (TodoVO todoVO : policyToDo) {
                 for (TzcPolicy item : dataList) {
                     if(item.getId().toString().equals(todoVO.getTargetId())){
                         todoVO.setTargetInfo(item);
@@ -115,7 +115,7 @@ public class CommonCheckServiceImpl implements CommonCheckService {
         if(CollUtil.isNotEmpty(verificationToDo)){
             List<String> ids = getTodoIds(verificationToDo);
             List<VtbVerification> dataList = verificationMapper.selectBatchIds(ids);
-            for (TodoVO todoVO : costToDo) {
+            for (TodoVO todoVO : verificationToDo) {
                 for (VtbVerification item : dataList) {
                     if(item.getId().toString().equals(todoVO.getTargetId())){
                         todoVO.setTargetInfo(item);
@@ -128,7 +128,7 @@ public class CommonCheckServiceImpl implements CommonCheckService {
         if(CollUtil.isNotEmpty(budgetToDo)){
             List<String> ids = getTodoIds(budgetToDo);
             List<TbsBudget> dataList = tbsBudgetMapper.selectBatchIds(ids);
-            for (TodoVO todoVO : costToDo) {
+            for (TodoVO todoVO : budgetToDo) {
                 for (TbsBudget item : dataList) {
                     if(item.getId().toString().equals(todoVO.getTargetId())){
                         todoVO.setTargetInfo(item);
@@ -141,7 +141,7 @@ public class CommonCheckServiceImpl implements CommonCheckService {
         if(CollUtil.isNotEmpty(budgetChangeToDo)){
             List<String> ids = getTodoIds(budgetChangeToDo);
             List<TbsBudgetChange> dataList = tbsBudgetChangeMapper.selectBatchIds(ids);
-            for (TodoVO todoVO : costToDo) {
+            for (TodoVO todoVO : budgetChangeToDo) {
                 for (TbsBudgetChange item : dataList) {
                     if(item.getId().toString().equals(todoVO.getTargetId())){
                         todoVO.setTargetInfo(item);
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java
index f38a3156..36afe27e 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java
@@ -70,7 +70,7 @@ public class TbsBudgetMatchApplication {
                 if(usableAmt==null){
                     usableAmt = itemBudget.getUnUsedBudgetAmount();
                 }
-                if(usableAmt.compareTo(centerGoods.getCenterGoodsAmount())>=0){
+                if(usableAmt!=null&&usableAmt.compareTo(centerGoods.getCenterGoodsAmount())>=0){
                     usableAmt = usableAmt.subtract(centerGoods.getCenterGoodsAmount());
                     //扣减后存放map
                     usableAmountMap.put(scheduleItemBudgetId,usableAmt);
diff --git a/src/main/resources/mapper/seeyon/CommonCheckMapper.xml b/src/main/resources/mapper/seeyon/CommonCheckMapper.xml
index d31f9bfc..98a91aaa 100644
--- a/src/main/resources/mapper/seeyon/CommonCheckMapper.xml
+++ b/src/main/resources/mapper/seeyon/CommonCheckMapper.xml
@@ -29,7 +29,7 @@
             vtb.create_time as submit_time
         from vtb_verification vtb
                  left join tbs_activity act on vtb.activity_id = act.id
-        where vtb.verification_state = 4 and vtb.user_id = #{query.userId} and act.del_flag = 0 and vtb.del_flag = 0
+        where vtb.verification_state = 3 and vtb.user_id = #{query.userId} and act.del_flag = 0 and vtb.del_flag = 0
         UNION
         select
             'budgetAdjust' as target_type,
@@ -68,7 +68,7 @@
                  vtb.id as target_id
              from vtb_verification vtb
                       left join tbs_activity act on vtb.activity_id = act.id
-             where vtb.verification_state = 4 and vtb.user_id = #{query.userId} and vtb.del_flag = 0
+             where vtb.verification_state = 3 and vtb.user_id = #{query.userId} and vtb.del_flag = 0
              UNION
              select
                  'budgetAdjust' as target_type,