swspkmas.git - Gitblit

			@@ -52,12 +52,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>


			@@ -161,22 +167,28 @@
			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.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