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/NonCoalPayMapper.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
index 352ec81..87f4d9c 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
@@ -59,7 +59,7 @@
<result property="idCard" column="id_card"/>
<result property="studentName" column="student_name"/>
<result property="payStatus" column="pay_status"/>
- <!-- <result property="govPayStatus" column="gov_pay_status"/>-->
+ <result property="govPayStatus" column="gov_pay_status"/>
<result property="fileData" column="file_data"/>
<result property="nonCoalPayType" column="non_coal_pay_type"/>
<result property="orderId" column="order_id"/>
@@ -184,7 +184,7 @@
t.id_card,
t.name as student_name,
t.pay_status,
--- t.gov_pay_status,
+ t.gov_pay_status,
t.file_data,
t.pay_type as non_coal_pay_type,
t.order_id,
@@ -234,6 +234,8 @@
<result property="studentName" column="student_name"/>
<result property="payStatus" column="pay_status"/>
<result property="orderId" column="order_id"/>
+ <result property="orderNo" column="order_no"/>
+ <result property="govPayStatus" column="gov_pay_status"/>
</resultMap>
@@ -260,9 +262,12 @@
t.id_card,
t.name as student_name,
t.pay_status,
- t.order_id
+ t.order_id,
+ t.gov_pay_status,
+ t.order_no
from non_coal_pay a
- inner join non_coal_pay_student t on t.non_coal_pay_id = a.id and t.del_flag = 0 and t.pay_status = 0
+ inner join non_coal_pay_student t on t.non_coal_pay_id = a.id and t.del_flag = 0 and t.pay_status = 0 and
+ t.order_id is null
inner join non_coal_pay_category b on a.id = b.non_coal_pay_id and b.del_flag = 0
left join non_coal_category c on b.category_id = c.id and c.del_flag = 0
where a.del_flag = 0
--
Gitblit v1.9.2