feat: 合并核销首页-我被退回的审批列表

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

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>