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 + + 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 + select 'CostBill' as target_type, @@ -379,6 +386,26 @@ and budget_change.submit_time <= #{query.endDate} + 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 + + and vtb_verification_batch.batch_title like concat('%',#{query.title},'%') + + + and vtb_verification_batch.batch_code like concat('%',#{query.targetCode},'%') + + + and vtb_verification_batch.create_time >= #{query.startDate} + + + and vtb_verification_batch.create_time <= #{query.endDate} + + ) tmp_tb