From bc472feefdfc4afbcb0fcd35a8fb8d047edf6a9f Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Tue, 18 Feb 2025 16:50:30 +0800
Subject: [PATCH] 煤矿缴费修改
---
exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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..4e837a6 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
@@ -40,6 +40,7 @@
<result property="payType" column="pay_type"/>
<result property="amount" column="amount"/>
<result property="year" column="year"/>
+ <result property="payPersonType" column="pay_person_type"/>
<result property="quarter" column="quarter"/>
<collection property="nonCoalPayCategoryList" javaType="java.util.List" resultMap="nonCoalPayCategoryList"/>
</resultMap>
@@ -59,7 +60,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"/>
@@ -147,6 +148,7 @@
d.dept_name,
a.district_code,
a.pay_type,
+ a.pay_person_type,
a.amount,
a.year,
a.quarter,
@@ -171,6 +173,7 @@
d.dept_name,
a.district_code,
a.pay_type,
+ a.pay_person_type,
a.amount,
a.year,
a.quarter,
@@ -184,7 +187,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 +237,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,7 +265,9 @@
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_category b on a.id = b.non_coal_pay_id and b.del_flag = 0
--
Gitblit v1.9.2