From c5adb3383bcebd1850142eada04dbb57c2d9fd0e Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 22 Dec 2023 11:05:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=B9=E9=87=8F=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=95=B0=E6=8D=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/yyth/biz/empcard/EmpCardMapper.xml    | 55 +++++++++----------
 .../biz/lpkgiftcard/LpkGiftCardMapper.xml     |  3 +-
 .../yyth/biz/lpkgiftcard/LpkGiftCardRest.java |  2 +-
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml
index e3948f6..9758db8 100644
--- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml
@@ -58,7 +58,7 @@
     <select id="recordDetails" resultType="com.yxt.yyth.api.empcard.EmpCardVo">
         SELECT
         card.sid,
-        card.recordId,
+        br.id as recordId,
         date_format(card.createTime, '%Y-%m-%d') as createTime,
         card.remarks,
         card.giftbagSid,
@@ -76,30 +76,29 @@
         card.customerSid
         FROM
         emp_card card
+        left join emp_card_build_record as br
+        on card.recordSid = br.sid
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
     <select id="getEmpCardBySid" resultType="com.yxt.yyth.api.empcard.EmpAppletVo">
-        SELECT
-        card.*,
-        CASE
-        card.state
-        WHEN 2 THEN
-        '已绑定'
-        WHEN 3 THEN
-        '已完成'
-        END stateValue,
-        bag.dateStart AS dateStart,
-        bag.dateEnd AS dateEnd,
-        bag.NAME AS pname,
-        card.state AS states,
-        card.serialNumber AS serialNumber
-        FROM
-        emp_card card
-        LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
-        where
-            card.sid = #{sid}
+        SELECT card.*,
+               CASE
+                   card.state
+                   WHEN 2 THEN
+                       '已绑定'
+                   WHEN 3 THEN
+                       '已完成'
+                   END              stateValue,
+               bag.dateStart     AS dateStart,
+               bag.dateEnd       AS dateEnd,
+               bag.NAME          AS pname,
+               card.state        AS states,
+               card.serialNumber AS serialNumber
+        FROM emp_card card
+                 LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
+        where card.sid = #{sid}
     </select>
     <select id="getEmpCardByCustomerSid" resultType="com.yxt.yyth.api.empcard.EmpAppletVo">
         SELECT
@@ -121,14 +120,12 @@
         </where>
     </select>
     <select id="selEmpCardSid" resultType="com.yxt.yyth.api.empcard.EmpCardVo">
-        SELECT
-        card.*,
-        s.name as goodsNmae,
-        s.sid as goodsSid
-        FROM
-        emp_card card
-        LEFT JOIN lpk_giftbag bag on card.giftbagSid=bag.sid
-        left join lpk_giftbag_goods s on card.sid=s.giftbagSid
-        where card.sid=#{empCardSid}
+        SELECT card.*,
+               s.name as goodsNmae,
+               s.sid  as goodsSid
+        FROM emp_card card
+                 LEFT JOIN lpk_giftbag bag on card.giftbagSid = bag.sid
+                 left join lpk_giftbag_goods s on card.sid = s.giftbagSid
+        where card.sid = #{empCardSid}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
index a4b37fa..3200c2c 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
@@ -88,7 +88,7 @@
     <select id="recordDetails" resultType="com.yxt.yyth.api.lpkgiftcard.LpkGiftCardListVo">
         SELECT
         card.sid,
-        card.recordId,
+        br.id as recordId,
         date_format(card.createTime, '%Y-%m-%d') as createTime,
         card.remarks,
         card.giftbagSid,
@@ -111,6 +111,7 @@
         lpk_giftcard card
         left join lpk_bank bank on bank.sid=card.bankSid
         left join lpk_card_grant_record rr on rr.sid =card.grantRecordSid
+        left join lpk_card_build_record br on br.sid =card.recordSid
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
index b067ae5..f97992d 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java
@@ -139,7 +139,7 @@ public class LpkGiftCardRest {
             @RequestParam(value = "file") MultipartFile file,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException {
-        return lpkGiftCardService.getExcelInfo2(startDate,endDate,file,request,response);
+        return lpkGiftCardService.getExcelInfo3(startDate,endDate,file,request,response);
     }
 
 }