feat: 结算包结算详情列表-只查结算成功、失败、申请结算的

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

@@ -78,7 +78,7 @@ public class WmScorePackageSettleNoteController {
 	 */
 	@ApiOperation(value = "分页查询任务+结算信息", notes = "分页查询任务+结算信息")
 	@GetMapping("/settle/page")
-	public R getWmTaskForSettlePage(Page page, WmScorePackageSettleNote note) {
+	public R getWmTaskForSettlePage(Page page, WmScorePackageSettleNote note, String[] settleStatusArr) {
 		if (StringUtils.isEmpty(note.getPackageId())) {
 			return R.failed("参数异常");
 		}
@@ -93,7 +93,7 @@ public class WmScorePackageSettleNoteController {
 
 		WmScorePackage scorePackage = wmScorePackageService.getById(note.getPackageId());
 		if (PackageTypeEnum.TYPE1_SCORE_AND_TASK_PACKAGE.val().equals(scorePackage.getPackageType1())) {
-			IPage<WmTaskSettleNoteOutput> settlePage2 = wmScorePackageSettleNoteService.getWmTaskForSettlePage2(page, note);
+			IPage<WmTaskSettleNoteOutput> settlePage2 = wmScorePackageSettleNoteService.getWmTaskForSettlePage2(page, note, settleStatusArr);
 			settlePage2.getRecords().forEach(output -> {
 				if (output.getSubjectLocation() != null) {
 					output.setSubjectLocationName(output.getSubjectLocation().getDescription());
@@ -102,7 +102,7 @@ public class WmScorePackageSettleNoteController {
 			return R.ok(settlePage2);
 		}
 
-		IPage<WmTaskSettleNoteOutput> settlePage = wmScorePackageSettleNoteService.getWmTaskForSettlePage(page, note);
+		IPage<WmTaskSettleNoteOutput> settlePage = wmScorePackageSettleNoteService.getWmTaskForSettlePage(page, note, settleStatusArr);
 		settlePage.getRecords().forEach(output -> {
 			if (output.getSubjectLocation() != null) {
 				output.setSubjectLocationName(output.getSubjectLocation().getDescription());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmScorePackageSettleNoteMapper.java

@@ -48,16 +48,17 @@ public interface WmScorePackageSettleNoteMapper extends BaseMapper<WmScorePackag
 	 * @param note
 	 * @return
 	 */
-	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage(Page page, @Param("query") WmScorePackageSettleNote note);
+	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage(Page page, @Param("query") WmScorePackageSettleNote note, @Param("settleStatusArr") String[] settleStatusArr);
 
 	/**
 	 * 结算包结算列表（分页）
 	 *
 	 * @param page
 	 * @param note
+	 * @param settleStatusArr
 	 * @return
 	 */
-	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage2(Page page, @Param("query") WmScorePackageSettleNote note);
+	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage2(Page page, @Param("query") WmScorePackageSettleNote note, @Param("settleStatusArr") String[] settleStatusArr);
 
 	/**
 	 * 结算包结算列表

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmScorePackageSettleNoteService.java

@@ -40,18 +40,20 @@ public interface WmScorePackageSettleNoteService extends IService<WmScorePackage
 	 *
 	 * @param page
 	 * @param note
+	 * @param settleStatusArr
 	 * @return
 	 */
-	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage(Page page, WmScorePackageSettleNote note);
+	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage(Page page, WmScorePackageSettleNote note, String[] settleStatusArr);
 
 	/**
 	 * 结算包结算列表（分页）
 	 *
 	 * @param page
 	 * @param note
+	 * @param settleStatusArr
 	 * @return
 	 */
-	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage2(Page page, WmScorePackageSettleNote note);
+	IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage2(Page page, WmScorePackageSettleNote note, String[] settleStatusArr);
 
 	/**
 	 * 结算包结算列表

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageSettleNoteServiceImpl.java

@@ -118,8 +118,8 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 	 * @return
 	 */
 	@Override
-	public IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage(Page page, WmScorePackageSettleNote note) {
-		return noteMapper.getWmTaskForSettlePage(page, note);
+	public IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage(Page page, WmScorePackageSettleNote note, String[] settleStatusArr) {
+		return noteMapper.getWmTaskForSettlePage(page, note, settleStatusArr);
 	}
 
 	/**
@@ -127,11 +127,12 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 	 *
 	 * @param page
 	 * @param note
+	 * @param settleStatusArr
 	 * @return
 	 */
 	@Override
-	public IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage2(Page page, WmScorePackageSettleNote note) {
-		return noteMapper.getWmTaskForSettlePage2(page, note);
+	public IPage<WmTaskSettleNoteOutput> getWmTaskForSettlePage2(Page page, WmScorePackageSettleNote note, String[] settleStatusArr) {
+		return noteMapper.getWmTaskForSettlePage2(page, note, settleStatusArr);
 	}
 
 	/**

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

@@ -131,6 +131,12 @@
 		<if test="query.realName != null">
 			AND u.realname like concat('%',#{query.realName},'%')
 		</if>
+		<if test="settleStatusArr != null">
+			AND e.settle_note_status in
+			<foreach collection="settleStatusArr" item="settleStatus" index="index" open="(" close=")" separator=",">
+				#{settleStatus}
+			</foreach>
+		</if>
 		ORDER BY e.sub_time DESC, t.id
 	</select>
 
@@ -180,6 +186,12 @@
 		<if test="query.realName != null">
 			AND u.realname like concat('%',#{query.realName},'%')
 		</if>
+		<if test="settleStatusArr != null">
+			AND e.settle_note_status in
+			<foreach collection="settleStatusArr" item="settleStatus" index="index" open="(" close=")" separator=",">
+				#{settleStatus}
+			</foreach>
+		</if>
 		ORDER BY e.sub_time DESC, t.id
 	</select>