更新批量导入数据功能

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,13 +76,14 @@
         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.*,
+        SELECT card.*,
                CASE
                    card.state
                    WHEN 2 THEN
@@ -95,11 +96,9 @@
                bag.NAME          AS pname,
                card.state        AS states,
                card.serialNumber AS serialNumber
-        FROM
-        emp_card card
+        FROM emp_card card
                  LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid
-        where
-            card.sid = #{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.*,
+        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}
+        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>

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>

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);
     }
 
 }