From 0bc94d86e0caf9112d83da02c1b91a3ea343cb0a Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Wed, 19 Mar 2025 09:16:05 +0800
Subject: [PATCH] 修改非煤统计
---
exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml | 17 ++++++++++++-----
1 files changed, 12 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 2cabe3f..6e66602 100644
--- a/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/NonCoalPayMapper.xml
@@ -64,6 +64,7 @@
<result property="fileData" column="file_data"/>
<result property="nonCoalPayType" column="non_coal_pay_type"/>
<result property="orderId" column="order_id"/>
+ <result property="payCode" column="pay_code"/>
<result property="createTime" column="create_time"/>
</resultMap>
@@ -107,8 +108,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
@@ -191,6 +193,7 @@
t.file_data,
t.pay_type as non_coal_pay_type,
t.order_id,
+ t.pay_code,
t.create_time
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
@@ -239,6 +242,8 @@
<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_stu"/>
</resultMap>
@@ -267,10 +272,12 @@
t.pay_status,
t.order_id,
t.gov_pay_status,
- t.order_no
+ t.order_no,
+ t.pay_code,
+ t.pay_type pay_type_stu
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