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 | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 102 insertions(+), 8 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..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>
@@ -52,12 +53,18 @@
<result property="categoryAmount" column="category_amount"/>
</resultMap>
- <resultMap id="getNonCoalPayResultH5" type="com.gkhy.exam.pay.dto.rep.NonCoalPayDetailH5RepDto">
+ <resultMap id="getNonCoalPayResultH5" type="com.gkhy.exam.pay.dto.rep.NonCoalPayDetailH5RepDto"
+ extends="getNonCoalPayResult">
<result property="nonCoalStudentId" column="non_coal_student_id"/>
<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"/>
+ <result property="createTime" column="create_time"/>
</resultMap>
@@ -100,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
@@ -141,6 +149,7 @@
d.dept_name,
a.district_code,
a.pay_type,
+ a.pay_person_type,
a.amount,
a.year,
a.quarter,
@@ -161,22 +170,29 @@
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.pay_person_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,
+ 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
inner join non_coal_pay_category b on a.id = b.non_coal_pay_id and b.del_flag = 0
@@ -190,6 +206,84 @@
</select>
+ <resultMap type="com.gkhy.exam.pay.dto.rep.NonCoalPayOrder" id="getNonCoalPayResultOrder">
+ <result property="id" column="id"/>
+ <result property="batchName" column="batch_name"/>
+ <result property="amount" column="amount"/>
+ <result property="payPersonType" column="pay_person_type"/>
+ <result property="payCompanyName" column="pay_company_name"/>
+ <result property="payCompanyCard" column="pay_company_card"/>
+ <collection property="nonCoalPayCategoryList" javaType="java.util.List"
+ resultMap="nonCoalPayCategoryListOrder"/>
+ <collection property="nonCoalStuList" javaType="java.util.List"
+ resultMap="nonCoalPayStuListOrder"/>
+ </resultMap>
+ <resultMap id="nonCoalPayCategoryListOrder" type="com.gkhy.exam.pay.dto.rep.NonCoalCateRep">
+ <result property="id" column="non_category_id"/>
+ <result property="businessCode" column="business_code"/>
+ <result property="companyCode" column="company_code"/>
+ <result property="invoicingCompanyCode" column="invoicing_company_code"/>
+ <result property="drawer" column="drawer"/>
+ <result property="reviewer" column="reviewer"/>
+ <result property="categoryId" column="category_id"/>
+ <result property="subjectName" column="subject_name"/>
+ <result property="categoryType" column="category_type"/>
+ <result property="categoryAmount" column="category_amount"/>
+ </resultMap>
+
+ <resultMap id="nonCoalPayStuListOrder" type="com.gkhy.exam.pay.dto.rep.NonCoalStuRep">
+ <result property="id" column="non_coal_student_id"/>
+ <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="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>
+
+
+ <select id="selectNonCoalPayOrderByParam" resultMap="getNonCoalPayResultOrder">
+ select a.id,
+ a.batch_name,
+ a.pay_type,
+ a.amount,
+ a.pay_person_type,
+ a.pay_company_name,
+ a.pay_company_card,
+ b.id as non_category_id,
+ b.category_id,
+ c.subject_name,
+ c.category_type,
+ c.business_code,
+ c.company_code,
+ c.drawer,
+ c.reviewer,
+ c.invoicing_company_code,
+ b.category_amount,
+ t.id as non_coal_student_id,
+ t.phone,
+ t.id_card,
+ t.name as student_name,
+ t.pay_status,
+ 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
+ <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
+ <if test="payType != null and payType == 2 ">and a.id = #{dataId} and t.pay_type = #{payType}</if>
+ <if test="payType != null and payType == 1 ">and t.id = #{dataId} and t.pay_type = #{payType}</if>
+
+ </select>
+
<insert id="insertNonCoalPay" parameterType="NonCoalPay" useGeneratedKeys="true" keyProperty="id">
insert into non_coal_pay
--
Gitblit v1.9.2