Browse Source

feat: 财务复核功能相关id调整

lixuesong 1 year ago
parent
commit
5bd2e1c907

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

@@ -382,7 +382,8 @@ public class WmPayOffController {
 		List<SettleFinancialReviewSettleDetailVO> outputList = new ArrayList<>();
 		settleNotes.forEach(settleNote -> {
 			SettleFinancialReviewSettleDetailVO output = new SettleFinancialReviewSettleDetailVO();
-			output.setId(settleNote.getId());
+			output.setNoteId(String.valueOf(settleNote.getId()));
+			output.setPackageId(settleNote.getPackageId());
 			output.setUserId(settleNote.getUserId());
 			output.setDeptId(settleNote.getSettleDeptId());
 			output.setDiscount(settleNote.getDiscount());

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

@@ -20,7 +20,12 @@ public class SettleFinancialReviewSettleDetailVO implements Serializable {
 	/**
 	 * 结算id
 	 */
-	private Integer id;
+	private String noteId;
+
+	/**
+	 * 积分包id
+	 */
+	private String packageId;
 
 	/**
 	 * 用户id