feat: 积分包管理列表导出加积分包编号/提交时间2

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -1573,10 +1573,24 @@
 
 	<!-- 积分包结算列表 -->
 	<select id="listAllPackageSettle" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput">
-		SELECT p.id, d.name packageEntName, p.score_package_name, p.create_time, p.package_status,
-		p.package_finish_status,
-		p.settle_status, p.invoice_category, p.settle_amount ,p.package_type1, p.score, p.package_type2, p.sub_type, p.sub_location AS subject_location
-		FROM wm_score_package p, sys_dept d
+		SELECT
+			p.id,
+			p.pkg_sn AS package_sn,
+			d.name AS packageEntName,
+			p.score_package_name,
+			p.create_time,
+			p.package_status,
+			p.package_finish_status,
+			p.settle_status,
+			p.invoice_category,
+			p.settle_amount,
+			p.package_type1,
+			p.score,
+			p.package_type2,
+			p.sub_type,
+			p.sub_location AS subject_location
+		FROM wm_score_package p,
+		sys_dept d
 		WHERE
 		p.send_package_dept_id = d.dept_id
 		<if test="query.sendPackageDeptId != null and query.sendPackageDeptId != ''">
@@ -1613,22 +1627,23 @@
 	<!-- 积分包结算 -->
 	<select id="listAllPackageSettle2" resultType="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput">
 		SELECT distinct
-		p.id,
-		d.name packageEntName,
-		p.score_package_name,
-		p.create_time,
-		p.package_status,
-		p.package_finish_status,
-		p.settle_status,
-		p.invoice_category,
-		p.settle_amount ,
-		p.package_type1,
-		p.score,
-		p.package_type2,
-		p.sub_type,
-		p.source_type,
-		p.pkg_sn,
-		p.oms_order_sn
+			p.id,
+			p.pkg_sn AS package_sn,
+			d.name AS packageEntName,
+			p.score_package_name,
+			p.create_time,
+			p.package_status,
+			p.package_finish_status,
+			p.settle_status,
+			p.invoice_category,
+			p.settle_amount ,
+			p.package_type1,
+			p.score,
+			p.package_type2,
+			p.sub_type,
+			p.source_type,
+			p.pkg_sn,
+			p.oms_order_sn
 		FROM wm_score_package p left join sys_dept d on p.send_package_dept_id = d.dept_id
 		left join wm_score_package_status ps on p.id = ps.package_id
 		left join sys_user su on ps.user_id = su.user_id