From 727c30f11ede5b3c82ead6e09e5e077c0e7519f1 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期三, 05 二月 2025 13:02:21 +0800
Subject: [PATCH] Merge branch 'dev-20250116' of https://sinanoaq.cn:8888/r/swspkmas into dev-20250116

---
 exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml
index 06d44bf..b15f948 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml
@@ -23,6 +23,7 @@
         <result property="orderId" column="order_id"/>
         <result property="fileData" column="file_data"/>
         <result property="payTime" column="pay_time"/>
+        <result property="govPayStatus" column="gov_pay_status"/>
     </resultMap>
 
     <sql id="selectNonCoalPayStudentVo">
@@ -43,7 +44,8 @@
                order_no,
                order_id,
                file_data,
-               pay_time
+               pay_time,
+               gov_pay_status
         from non_coal_pay_student
     </sql>
 
@@ -77,6 +79,7 @@
             <if test="idCard != null and idCard != ''">id_card,</if>
             <if test="phone != null and phone != ''">phone,</if>
             <if test="sex != null">sex,</if>
+            <if test="govPayStatus!=null">gov_pay_status,</if>
             <if test="payCode != null">pay_code,</if>
             <if test="payType != null">pay_type,</if>
             <if test="orderNo != null and orderNo != '' ">order_no,</if>
@@ -94,6 +97,7 @@
             <if test="idCard != null and idCard != ''">#{idCard},</if>
             <if test="phone != null and phone != ''">#{phone},</if>
             <if test="sex != null">#{sex},</if>
+            <if test="govPayStatus!=null">#{govPayStatus},</if>
             <if test="payCode != null">#{payCode},</if>
             <if test="payType != null">#{payType},</if>
             <if test="orderNo != null and orderNo != '' ">#{orderNo},</if>
@@ -123,6 +127,7 @@
             <if test="sex != null">sex = #{sex},</if>
             <if test="orderNo != null and orderNo != ''">order_no = #{orderNo},</if>
             <if test="orderId != null and orderId != ''">order_id = #{orderId},</if>
+            <if test="govPayStatus!=null">gov_pay_status=#{govPayStatus},</if>
             <if test="fileData != null and fileData != ''">file_data = #{fileData},</if>
             <if test="payTime != null">pay_time = #{payTime},</if>
             <if test="payType != null">pay_type = #{payType},</if>

--
Gitblit v1.9.2