From ef57094e91072ebe05bb3781e028d6d7ad8a0c45 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期一, 17 二月 2025 11:15:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-20250116' into dev-20250116
---
exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml | 8 +++++++-
1 files changed, 7 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 4ef1099..b15f948 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayStudentMapper.xml
@@ -22,6 +22,7 @@
<result property="orderNo" column="order_no"/>
<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>
@@ -43,6 +44,7 @@
order_no,
order_id,
file_data,
+ 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>
@@ -121,9 +125,11 @@
<if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
<if test="phone != null and phone != ''">phone = #{phone},</if>
<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="govPayStatus != null">gov_pay_status = #{govPayStatus},</if>
+ <if test="payTime != null">pay_time = #{payTime},</if>
<if test="payType != null">pay_type = #{payType},</if>
<if test="payCode != null">pay_code = #{payCode},</if>
<if test="payStatus != null">pay_status = #{payStatus},</if>
--
Gitblit v1.9.2