feat: 1.积分包管理列表加提交时间,加提交时间筛选条件,导出excel加积分包编号

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -358,6 +358,7 @@ public class WmPayOffController {
 			WmScorePackageSettleOutput settleOutput = list.get(i);
 			WmScorePackageSettleExcelModel export = new WmScorePackageSettleExcelModel();
 			export.setNumber(i + 1);
+			export.setPackageSn(settleOutput.getPackageSn());
 			export.setScorePackageName(settleOutput.getScorePackageName());
 			export.setPackageType1(PackageTypeEnum.type1Resolve(settleOutput.getPackageType1()).getName2());
 			export.setPackageEntName(settleOutput.getPackageEntName());
@@ -418,6 +419,7 @@ public class WmPayOffController {
 			WmScorePackageSettleOutput settleOutput = list.get(i);
 			WmScorePackageSettleExcelModel export = new WmScorePackageSettleExcelModel();
 			export.setNumber(i + 1);
+			export.setPackageSn(settleOutput.getPackageSn());
 			export.setScorePackageName(settleOutput.getScorePackageName());
 			export.setPackageType1(PackageTypeEnum.type1Resolve(settleOutput.getPackageType1()).getName2());
 			export.setPackageEntName(settleOutput.getPackageEntName());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/input/WmScorePackageSettleInput.java

@@ -63,6 +63,11 @@ public class WmScorePackageSettleInput implements Serializable {
 
 	private LocalDateTime createTime;
 
+	/**
+	 * 业务提交结算时间
+	 */
+	private LocalDateTime[] settlementDate;
+
 	private String belongDate;
 
 	private Integer score;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/input/WmScorePackageSettleOutput.java

@@ -45,6 +45,16 @@ public class WmScorePackageSettleOutput {
 
 	private String scorePackageName;
 
+	/**
+	 * 积分包编号
+	 */
+	private String packageSn;
+
+	/**
+	 * 业务提交结算时间
+	 */
+	private String settlementDate;
+
 	private LocalDateTime createTime;
 
 	private String belongDate;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/model/excel/WmScorePackageSettleExcelModel.java

@@ -22,6 +22,13 @@ public class WmScorePackageSettleExcelModel {
 	@ExcelProperty("序号")
 	private Integer number;
 
+	/**
+	 * 积分包编号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("积分包编号")
+	private String packageSn;
+
 	/**
 	 * 积分包名称
 	 */

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

@@ -101,9 +101,11 @@
 	
 	<resultMap id="packageSettleMap" type="com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput">
 		<id property="id" column="id"/>
+		<result property="packageSn" column="pkg_sn"/>
 		<result property="scorePackageName" column="score_package_name"/>
 		<result property="packageEntName" column="name"/>
 		<result property="createTime" column="create_time"/>
+		<result property="settlementDate" column="settlement_date"/>
 		<result property="score" column="score"/>
 		<result property="packageFinishStatus" column="package_finish_status"/>
 		<result property="settleStatus" column="settle_status"/>
@@ -1481,9 +1483,11 @@
 	<select id="listPackageSettleList" resultMap="packageSettleMap">
 		SELECT distinct
 		    p.id,
+		    p.pkg_sn,
 			d.name,
 			p.score_package_name,
 			p.create_time,
+			p.settlement_date,
 			p.package_status,
 			p.package_finish_status,
 			p.settle_status,
@@ -1554,6 +1558,9 @@
 			<if  test="query.invoiceNumber != null and query.invoiceNumber != ''">
 				AND p.invoice_number like CONCAT('%',#{query.invoiceNumber},'%')
 			</if>
+			<if test="query.settlementDate != null and query.settlementDate.length == 2">
+				AND p.settlement_date between #{query.settlementDate[0]} and #{query.settlementDate[1]}
+			</if>
 		</where>
 		ORDER BY
 		<if test="query.mahSettleStep != null">