From 410e56245e82177774f70999ad5366d5d2375ce0 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Thu, 19 Oct 2023 16:58:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=87=91=E9=A2=9D=20?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E9=87=91=E9=A2=9D=E6=9F=A5=E8=AF=A2=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9EID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/vtb/entity/dto/VtbActivityCheckDTO.java |  1 +
 .../modules/vtb/entity/dto/VtbVerificationDTO.java  |  3 +++
 .../mapper/vtb/VtbVerForPayReportMapper.xml         |  2 ++
 .../resources/mapper/vtb/VtbVerReportMapper.xml     | 13 +++++++------
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbActivityCheckDTO.java b/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbActivityCheckDTO.java
index 600dbca5..a7edb58a 100644
--- a/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbActivityCheckDTO.java
+++ b/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbActivityCheckDTO.java
@@ -45,6 +45,7 @@ public class VtbActivityCheckDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime passTime;
 
+    private Long activityId;
     /** 活动编码 */
     private String activityCode;
 
diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java b/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java
index 58621546..33d5d6c9 100644
--- a/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java
+++ b/src/main/java/com/qs/serve/modules/vtb/entity/dto/VtbVerificationDTO.java
@@ -18,6 +18,8 @@ public class VtbVerificationDTO {
     /** 核销编码 */
     private String verificationCode;
 
+    private Long verificationId;
+
     /** 提交实际 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -65,4 +67,5 @@ public class VtbVerificationDTO {
     /** 活动内容 */
     private String actTitle;
 
+    private Long activityId;
 }
diff --git a/src/main/resources/mapper/vtb/VtbVerForPayReportMapper.xml b/src/main/resources/mapper/vtb/VtbVerForPayReportMapper.xml
index aeb354ac..974ee5ef 100644
--- a/src/main/resources/mapper/vtb/VtbVerForPayReportMapper.xml
+++ b/src/main/resources/mapper/vtb/VtbVerForPayReportMapper.xml
@@ -4,6 +4,7 @@
 
     <select id="pageVerificationCheck" resultType="com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO">
         SELECT
+        vtb.id as verificationId,
         vtb.verification_code,
         vtb.create_time,
         vtb.finished_time,
@@ -19,6 +20,7 @@
         cost.`code` as costApplyCode,
         cost.charge_theme,
         cost.submit_time,
+        act.id as activityId,
         act.cost_pass_time,
         act.activity_code,
         act.act_title
diff --git a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml
index e3cbc3a0..9763723c 100644
--- a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml
+++ b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml
@@ -180,6 +180,7 @@
         tbs_cost_apply.user_code,
         tbs_cost_apply.user_name,
         tbs_cost_apply.charge_state,
+        c.id as activityId,
         c.activity_code,
         c.act_title as activityTitle,
         c.act_start_date,
@@ -267,8 +268,8 @@
             and c.act_end_date &gt;= #{query.queryStartActivityEndTime} </if>
         <if test="query.queryEndActivityEndTime != null ">
             and c.act_end_date &lt;= #{query.queryEndActivityEndTime} </if>
-        <if test="query.activityCode != null and query.activityCode != ''"> and `tbs_activity`.`activity_code` like concat('%',#{query.activityCode},'%')</if>
-        <if test="query.activityTitle != null and query.activityTitle != ''"> and `tbs_activity`.`act_title` like concat('%',#{query.activityTitle},'%')</if>
+        <if test="query.activityCode != null and query.activityCode != ''"> and c.`activity_code` like concat('%',#{query.activityCode},'%')</if>
+        <if test="query.activityTitle != null and query.activityTitle != ''"> and c.`act_title` like concat('%',#{query.activityTitle},'%')</if>
         <if test="query.supplierCode != null and query.supplierCode != ''"> and `tbs_cost_apply`.`supplier_code` like concat('%',#{query.supplierCode},'%') </if>
         <if test="query.supplierName != null and query.supplierName != ''"> and `tbs_cost_apply`.`supplier_name` like concat('%',#{query.supplierName},'%') </if>
         <if test="query.costApplyCode != null and query.costApplyCode != ''"> and `tbs_cost_apply`.`code` like concat('%',#{query.costApplyCode},'%') </if>
@@ -309,8 +310,8 @@
             and c.act_end_date &gt;= #{query.queryStartActivityEndTime} </if>
         <if test="query.queryEndActivityEndTime != null ">
             and c.act_end_date &lt;= #{query.queryEndActivityEndTime} </if>
-        <if test="query.activityCode != null and query.activityCode != ''"> and `tbs_activity`.`activity_code` like concat('%',#{query.activityCode},'%')</if>
-        <if test="query.activityTitle != null and query.activityTitle != ''"> and `tbs_activity`.`act_title` like concat('%',#{query.activityTitle},'%')</if>
+        <if test="query.activityCode != null and query.activityCode != ''"> and c.`activity_code` like concat('%',#{query.activityCode},'%')</if>
+        <if test="query.activityTitle != null and query.activityTitle != ''"> and c.`act_title` like concat('%',#{query.activityTitle},'%')</if>
         <if test="query.supplierCode != null and query.supplierCode != ''"> and `tbs_cost_apply`.`supplier_code` like concat('%',#{query.supplierCode},'%') </if>
         <if test="query.supplierName != null and query.supplierName != ''"> and `tbs_cost_apply`.`supplier_name` like concat('%',#{query.supplierName},'%') </if>
         <if test="query.costApplyCode != null and query.costApplyCode != ''"> and `tbs_cost_apply`.`code` like concat('%',#{query.costApplyCode},'%') </if>
@@ -346,8 +347,8 @@
             and c.act_end_date &gt;= #{query.queryStartActivityEndTime} </if>
         <if test="query.queryEndActivityEndTime != null ">
             and c.act_end_date &lt;= #{query.queryEndActivityEndTime} </if>
-        <if test="query.activityCode != null and query.activityCode != ''"> and `tbs_activity`.`activity_code` like concat('%',#{query.activityCode},'%')</if>
-        <if test="query.activityTitle != null and query.activityTitle != ''"> and `tbs_activity`.`act_title` like concat('%',#{query.activityTitle},'%')</if>
+        <if test="query.activityCode != null and query.activityCode != ''"> and c.`activity_code` like concat('%',#{query.activityCode},'%')</if>
+        <if test="query.activityTitle != null and query.activityTitle != ''"> and c.`act_title` like concat('%',#{query.activityTitle},'%')</if>
         <if test="query.supplierCode != null and query.supplierCode != ''"> and `tbs_cost_apply`.`supplier_code` like concat('%',#{query.supplierCode},'%') </if>
         <if test="query.supplierName != null and query.supplierName != ''"> and `tbs_cost_apply`.`supplier_name` like concat('%',#{query.supplierName},'%') </if>
         <if test="query.costApplyCode != null and query.costApplyCode != ''"> and `tbs_cost_apply`.`code` like concat('%',#{query.costApplyCode},'%') </if>