From 1d14dbbf2005f38ced5a20e29acd1298efe2a318 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期三, 22 一月 2025 15:55:26 +0800
Subject: [PATCH] 特种作业非煤缴费版本导入优化

---
 exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
index 9370704..be83da0 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
@@ -57,7 +57,11 @@
         <result property="phone" column="phone"/>
         <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="fileData" column="file_data"/>
+        <result property="nonCoalPayType" column="non_coal_pay_type"/>
+        <result property="orderId" column="order_id"/>
     </resultMap>
 
 
@@ -161,22 +165,27 @@
         select a.id,
                a.batch_name,
                a.dept_id,
-               d2.name as district_name,
+               d2.name    as district_name,
                d.dept_name,
                a.district_code,
                a.pay_type,
                a.amount,
                a.year,
                a.quarter,
-               b.id    as non_category_id,
+               b.id       as non_category_id,
                b.category_id,
                c.subject_name,
                c.category_type,
                b.category_amount,
-               t.id    as non_coal_student_id,
+               t.id       as non_coal_student_id,
                t.phone,
                t.id_card,
-               t.name  as student_name
+               t.name     as student_name,
+               t.pay_status,
+--                t.gov_pay_status,
+               t.file_data,
+               t.pay_type as non_coal_pay_type,
+               t.order_id
         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
                  inner join non_coal_pay_category b on a.id = b.non_coal_pay_id and b.del_flag = 0

--
Gitblit v1.9.2