From d8aecbc76a43af6dfedf50f481d2b0838841782f Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期四, 20 二月 2025 10:25:41 +0800
Subject: [PATCH] 修改
---
exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
index 87f4d9c..7e7a2d9 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>
@@ -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,
@@ -266,8 +269,8 @@
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 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