From 5bf7be955a0aa53e4889c3bb303c27964361a62a Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Tue, 11 Jun 2024 15:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E6=9C=AC=E4=B8=AD?=
=?UTF-8?q?=E5=BF=83=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bir/entity/dto/BirTbsVtbPayJoinDTO.java | 2 ++
.../bir/entity/so/BirTbsVtbPayJoinSo.java | 2 +-
.../mapper/bir/BirTbsVtbPayJoinMapper.xml | 19 +++++++++++++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/qs/serve/modules/bir/entity/dto/BirTbsVtbPayJoinDTO.java b/src/main/java/com/qs/serve/modules/bir/entity/dto/BirTbsVtbPayJoinDTO.java
index ec104899..ae766884 100644
--- a/src/main/java/com/qs/serve/modules/bir/entity/dto/BirTbsVtbPayJoinDTO.java
+++ b/src/main/java/com/qs/serve/modules/bir/entity/dto/BirTbsVtbPayJoinDTO.java
@@ -52,6 +52,8 @@ public class BirTbsVtbPayJoinDTO {
private String activityTitle;
+ private String centerName;
+
/** 提交实际 */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
diff --git a/src/main/java/com/qs/serve/modules/bir/entity/so/BirTbsVtbPayJoinSo.java b/src/main/java/com/qs/serve/modules/bir/entity/so/BirTbsVtbPayJoinSo.java
index f92c2a2e..c1565fc0 100644
--- a/src/main/java/com/qs/serve/modules/bir/entity/so/BirTbsVtbPayJoinSo.java
+++ b/src/main/java/com/qs/serve/modules/bir/entity/so/BirTbsVtbPayJoinSo.java
@@ -129,5 +129,5 @@ public class BirTbsVtbPayJoinSo {
*/
private Integer contractFlag;
-
+ private String centerName;
}
diff --git a/src/main/resources/mapper/bir/BirTbsVtbPayJoinMapper.xml b/src/main/resources/mapper/bir/BirTbsVtbPayJoinMapper.xml
index 39ac2487..e983353f 100644
--- a/src/main/resources/mapper/bir/BirTbsVtbPayJoinMapper.xml
+++ b/src/main/resources/mapper/bir/BirTbsVtbPayJoinMapper.xml
@@ -62,11 +62,17 @@
act.activity_code as activity_code,
act.act_title as activity_title,
+
+
+ ac.center_name,
+
+
act.act_start_date as act_start_date,
act.act_end_date as act_end_date,
act.total_amount as activity_amount,
act.release_amount as release_amount
+
,v.id as vtb_id,
v.verification_code as vtb_code,
@@ -89,6 +95,16 @@
LEFT JOIN tbs_activity act ON a.id = act.cost_apply_id
LEFT JOIN vtb_verification v ON v.activity_id = act.id
LEFT JOIN pay_payment_item p ON p.verification_id = v.id
+
+
+ left join
+ (select activity_id, GROUP_CONCAT(DISTINCT center_name SEPARATOR ', ') AS center_name
+ from tbs_activity_center where
+ center_name LIKE CONCAT('%', #{query.centerSearch}, '%')
+ GROUP BY activity_id
+ ) as ac on act.id = ac.activity_id
+
+
WHERE
1=1
and a.del_flag = 0
@@ -97,6 +113,9 @@
and (act.del_flag = 0 or act.id is null )
and (v.del_flag = 0 or v.id is null )
and (p.del_flag = 0 or p.id is null )
+
+ AND c.center_name is not null
+
AND a.contract_flag = #{query.contractFlag}