From 976fe8de4d45ccdd18cf988a36b9d71697d3bcc3 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期五, 21 二月 2025 16:54:55 +0800
Subject: [PATCH] 修改
---
exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
index 3ef4f09..f70b024 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"/>
@@ -106,8 +107,9 @@
a.pay_type,
a.amount, a.year, a.quarter, a.pay_person_type, a.pay_company_name, a.pay_company_card, a.update_by,
a.update_time, a.create_by, a.create_time, (select count(id) from non_coal_pay_student where a.id =
- non_coal_pay_id) as total_num,
- (select count(id) from non_coal_pay_student where a.id = non_coal_pay_id and pay_status = 1) as have_pay_num
+ non_coal_pay_id and del_flag = 0) as total_num,
+ (select count(id) from non_coal_pay_student where a.id = non_coal_pay_id and pay_status = 1 and del_flag = 0) as
+ have_pay_num
from non_coal_pay a
left join sys_dept d on a.dept_id = d.dept_id
left join sys_district d2 on a.district_code = d2.code
@@ -147,6 +149,7 @@
d.dept_name,
a.district_code,
a.pay_type,
+ a.pay_person_type,
a.amount,
a.year,
a.quarter,
@@ -171,6 +174,7 @@
d.dept_name,
a.district_code,
a.pay_type,
+ a.pay_person_type,
a.amount,
a.year,
a.quarter,
@@ -184,7 +188,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 +238,10 @@
<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"/>
+ <result property="payCode" column="pay_code"/>
+ <result property="payType" column="pay_type"/>
</resultMap>
@@ -260,10 +268,14 @@
t.id_card,
t.name as student_name,
t.pay_status,
- t.order_id
+ t.order_id,
+ t.gov_pay_status,
+ t.order_no,
+ t.pay_code,
+ t.pay_type
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 and
- t.order_id is null
+ inner join non_coal_pay_student t on t.non_coal_pay_id = a.id and t.del_flag = 0
+ <if test="isPay != null and isPay == 1 ">and t.pay_status = 0</if>
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