swspkmas.git - Gitblit

			@@ -59,7 +59,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"/>
			@@ -184,7 +184,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 +234,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,7 +262,9 @@
			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 and
			t.order_id is null