From bd0279ab118e5f043133dfadff5d57a6849f893d Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 2 Jul 2024 11:10:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=90=88=E5=B9=B6=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E6=88=91=E8=A2=AB=E9=80=80=E5=9B=9E?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TbsBudgetBatchServiceImpl.java       |  2 +-
 .../mapper/seeyon/CommonCheckMapper.xml       | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java
index 24c7ec34..7417cf93 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java
@@ -124,7 +124,7 @@ public class TbsBudgetBatchServiceImpl extends ServiceImpl<TbsBudgetBatchMapper,
         seeYonService.createCallbackStatus(callbackBo);
         //请求校验是否成功
         AsyncManager.me().execute(AsyncFactory.submitBudgetBatch(budgetBatchId+""));
-        return budgetBatch;
+        return null;
     }
 
     public TbsBudgetBatch buildBatchData(TbsBudgetBatchBo param,String batchCode,SysUser sysUser){
diff --git a/src/main/resources/mapper/seeyon/CommonCheckMapper.xml b/src/main/resources/mapper/seeyon/CommonCheckMapper.xml
index 985d91e2..f4c7bbb9 100644
--- a/src/main/resources/mapper/seeyon/CommonCheckMapper.xml
+++ b/src/main/resources/mapper/seeyon/CommonCheckMapper.xml
@@ -287,6 +287,13 @@
                 from tbs_budget_change budget_change
                 where budget_change.budget_check_state = 3 and budget_change.user_id = #{query.userId} and budget_change.del_flag = 0
             </if>
+            <if test="query.targetType == 'BatchCheckCost'">
+                select
+                'BatchCheckCost' as target_type,
+                vtb_verification_batch.id as target_id
+                from  vtb_verification_batch
+                where vtb_verification_batch.vtb_batch_status = 3 and vtb_verification_batch.user_id = #{query.userId} and vtb_verification_batch.del_flag = 0
+            </if>
             <if test="query.targetType == null ">
                 select
                 'CostBill' as target_type,
@@ -379,6 +386,26 @@
                 <if test="query.endDate !=null">
                     and budget_change.submit_time &lt;= #{query.endDate}
                 </if>
+                union
+                select
+                'BatchCheckCost' as target_type,
+                vtb_verification_batch.id as target_id
+                from vtb_verification_batch
+                where vtb_verification_batch.vtb_batch_status = 3 and vtb_verification_batch.user_id = #{query.userId}
+                and vtb_verification_batch.del_flag = 0
+                <if test="query.title !=null and query.title != ''">
+                    and vtb_verification_batch.batch_title like concat('%',#{query.title},'%')
+                </if>
+                <if test="query.targetCode !=null and query.targetCode != ''">
+                    and vtb_verification_batch.batch_code  like concat('%',#{query.targetCode},'%')
+                </if>
+                <if test="query.startDate !=null">
+                    and vtb_verification_batch.create_time &gt;= #{query.startDate}
+                </if>
+                <if test="query.endDate !=null">
+                    and vtb_verification_batch.create_time &lt;= #{query.endDate}
+                </if>
+
             </if>
         ) tmp_tb
     </select>