煤矿缴费修改

“djh”

2025-02-17 01abd59918bfc5412e23f685997bc4a4bfdbfc50

 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"/>
@@ -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,
@@ -184,7 +187,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 +237,8 @@
        <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"/>
    </resultMap>


@@ -260,9 +265,12 @@
        t.id_card,
        t.name as student_name,
        t.pay_status,
        t.order_id
        t.order_id,
        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
        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_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