feat: 财务复核功能-批量结算列表数据

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

@@ -24,6 +24,7 @@ import com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleInput;
 import com.qunzhixinxi.hnqz.admin.entity.input.WmScorePackageSettleOutput;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.SettlementProofModel;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.WmScorePackageSettleExcelModel;
+import com.qunzhixinxi.hnqz.admin.entity.vo.SettleFinancialReviewSettleDetailVO;
 import com.qunzhixinxi.hnqz.admin.entity.vo.SettleFinancialReviewVO;
 import com.qunzhixinxi.hnqz.admin.enums.DeptPermissionEnum;
 import com.qunzhixinxi.hnqz.admin.enums.PackageFinishStatusEnum;
@@ -373,22 +374,38 @@ public class WmPayOffController {
 		return R.ok(detailPage);
 	}
 
-	public R<List<WmScorePackageSettleOutput>> listFinancialReviewDetail(String[] settleNoteIds) {
+	/**
+	 * 查询财务复核-批量结算列表数据
+	 *
+	 * @param settleNoteIds 结算id
+	 * @return {@link R}<{@link List}<{@link WmScorePackageSettleOutput}>> 结果
+	 */
+	@GetMapping("/list-financial-review_settle_detail")
+	public R<List<SettleFinancialReviewSettleDetailVO>> listFinancialReviewSettleDetail(String[] settleNoteIds) {
 		List<WmScorePackageSettleNote> settleNotes = wmScorePackageSettleNoteService.listByIds(Arrays.asList(settleNoteIds));
 
 		List<SysUser> sysUsers = sysUserService.listByIds(settleNotes.stream().map(WmScorePackageSettleNote::getUserId).collect(Collectors.toSet()));
+		Map<Integer, SysUser> userMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getUserId, Function.identity()));
 
-		List<WmScorePackageSettleOutput> outputList = new ArrayList<>();
+		List<SettleFinancialReviewSettleDetailVO> outputList = new ArrayList<>();
 		settleNotes.forEach(settleNote -> {
-			WmScorePackageSettleOutput output = new WmScorePackageSettleOutput();
+			SettleFinancialReviewSettleDetailVO output = new SettleFinancialReviewSettleDetailVO();
+			output.setId(settleNote.getId());
+			output.setUserId(settleNote.getUserId());
+			output.setDeptId(settleNote.getSettleDeptId());
+			output.setDiscount(settleNote.getDiscount());
 			output.setSettleAmount(settleNote.getSettleAmount());
 			output.setActualAmount(settleNote.getActualAmount());
-//			output.setUserNames(settleNote.getUserNames());
+			SysUser sysUser = userMap.get(Integer.parseInt(settleNote.getUserId()));
+			output.setUsername(sysUser.getUsername());
+			output.setRealname(sysUser.getRealname());
+			output.setSettleStatus(settleNote.getSettleNoteStatus());
+			output.setSubjectLocation(settleNote.getSubjectLocation());
+			output.setReviewStatus(settleNote.getReviewStatus());
+			outputList.add(output);
 		});
 
-		// TODO
-
-		return null;
+		return R.ok(outputList);
 	}
 
 	/**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/vo/SettleFinancialReviewSettleDetailVO.java

@@ -0,0 +1,75 @@
+package com.qunzhixinxi.hnqz.admin.entity.vo;
+
+import com.qunzhixinxi.hnqz.admin.api.constant.UpmsState;
+import com.qunzhixinxi.hnqz.admin.enums.SubjectLocation;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 财务结算复核详情VO
+ *
+ * @author lixuesong
+ * @date 2024/01/09
+ */
+@Data
+public class SettleFinancialReviewSettleDetailVO implements Serializable {
+	private static final long serialVersionUID = 1690853997106657014L;
+
+	/**
+	 * 结算id
+	 */
+	private Integer id;
+
+	/**
+	 * 用户id
+	 */
+	private String userId;
+
+	/**
+	 * 企业id
+	 */
+	private Integer deptId;
+
+	/**
+	 * 用户姓名
+	 */
+	private String realname;
+
+	/**
+	 * 用户名
+	 */
+	private String username;
+
+	/**
+	 * 结算渠道
+	 */
+	private SubjectLocation subjectLocation;
+
+	/**
+	 * 结算金额
+	 */
+	private BigDecimal settleAmount;
+
+	/**
+	 * 实际结算金额
+	 */
+	private BigDecimal actualAmount;
+
+	/**
+	 * 结算状态
+	 */
+	private Integer settleStatus;
+
+	/**
+	 * 折扣
+	 */
+	private BigDecimal discount;
+
+	/**
+	 * 复核状态
+	 */
+	private UpmsState.SettleFinancialReviewStatus reviewStatus;
+
+}