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

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

@@ -1583,7 +1583,7 @@
 			AND p.send_package_dept_id= #{query.sendPackageDeptId}
 		</if>
 		<if test="query.scorePackageName != null and query.scorePackageName != ''">
-			AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%')
+			AND (p.score_package_name like CONCAT('%',#{query.scorePackageName},'%') OR p.pkg_sn like CONCAT('%',#{query.scorePackageName},'%'))
 		</if>
 		<if test="query.belongDate != null and query.belongDate != ''">
 			AND p.belong_date= #{query.belongDate}
@@ -1603,6 +1603,9 @@
 		<if test="query.settleFlag != null and query.settleFlag != ''">
 			AND p.settle_flag= #{query.settleFlag}
 		</if>
+		<if test="query.settlementDate != null and query.settlementDate.length == 2">
+			AND p.settlement_date between #{query.settlementDate[0]} and #{query.settlementDate[1]}
+		</if>
 		ORDER BY
 		p.create_time DESC
 	</select>
@@ -1634,7 +1637,7 @@
 				AND p.send_package_dept_id= #{query.sendPackageDeptId}
 			</if>
 			<if test="query.scorePackageName != null and query.scorePackageName != ''">
-				AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%')
+				AND (p.score_package_name like CONCAT('%',#{query.scorePackageName},'%') OR p.pkg_sn like CONCAT('%',#{query.scorePackageName},'%'))
 			</if>
 			<if test="query.belongDate != null and query.belongDate != ''">
 				AND p.belong_date= #{query.belongDate}
@@ -1660,6 +1663,9 @@
 			<if test="query.userNames != null">
 				AND su.realname like CONCAT('%',#{query.userNames},'%')
 			</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
 		p.create_time DESC