feat: 财务复核功能-查询按钮列表数据改为noteid查询

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

@@ -353,22 +353,14 @@ public class WmPayOffController {
 	 * 查询财务结算复核汇总数据
 	 *
 	 * @param page 分页参数
-	 * @param userId 用户id
-	 * @param subjectLocation 结算渠道
+	 * @param settleNoteIds 结算id
 	 * @return {@link R}<{@link ?}> 结果
 	 */
 	@GetMapping("/page-financial-review-detail")
 	public R<IPage<WmScorePackageSettleOutput>> pageFinancialReviewDetail(Page<WmScorePackageSettleOutput> page,
-																	@Param("userId") Integer userId,
-																	SubjectLocation subjectLocation,
-																	Boolean reviewFlag) {
-		Integer deptId = SecurityUtils.getUser().getDeptId();
-
+																	@Param("userId") String[] settleNoteIds) {
 		SettleFinancialReviewVO query = new SettleFinancialReviewVO();
-		query.setSubjectLocation(subjectLocation);
-		query.setReviewFlag(reviewFlag);
-		query.setDeptId(deptId);
-		query.setUserId(userId);
+		query.setSettleNoteIds(settleNoteIds);
 		IPage<WmScorePackageSettleOutput> detailPage = wmScorePackageService.pageFinancialReviewDetail(page, query);
 
 		return R.ok(detailPage);

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

@@ -1785,21 +1785,10 @@
 		FROM wm_score_package_settle_note n
 				 LEFT JOIN wm_score_package p ON n.package_id = p.id
 				 LEFT JOIN sys_user u ON u.user_id = n.user_id
-		WHERE (
-					p.send_package_dept_id = #{query.deptId} OR
-					p.mah_settle_dept_id = #{query.deptId} AND p.mah_settle_step = 'FINANCE')
-		  AND p.package_finish_status = 1
-		  AND p.typeid IN (4, 5)
-		  AND p.settle_flag = 1
-		  AND u.user_id = #{query.userId}
-		<if test="query.subjectLocation != null">
-			AND n.subject_location = #{query.subjectLocation}
-		</if>
-		<if test="query.reviewFlag != null and query.reviewFlag == true">
-			AND n.review_status in ('PASSED', 'REJECTED')
-		</if>
-		<if test="query.reviewFlag == null or query.reviewFlag == false">
-			AND n.review_status is null
-		</if>
+		WHERE n.id in (
+		<foreach collection="query.settleNoteIds" item="noteId" index="index" separator=",">
+			#{noteId}
+		</foreach>
+		)
 	</select>
 </mapper>