浏览代码

feat: 财务结算excel导出加实际支付金额

李学松 2 年之前
父节点
当前提交
503ccc1ce9

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

@@ -288,6 +288,7 @@ public class WmPayOffController {
 			export.setInvoiceCategory(invoice);
 			export.setUserNames(settleOutput.getUserNames());
 			export.setSettleAmount(settleOutput.getSettleAmount());
+			export.setActualAmount(settleOutput.getActualAmount());
 			export.setSettleStatus(SettleStatusEnum.resolve(settleOutput.getSettleStatus()).getName());
 			export.setBelongDate(settleOutput.getBelongDate());
 			exportList.add(export);

+ 7 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/model/excel/WmScorePackageSettleExcelModel.java

@@ -92,6 +92,13 @@ public class WmScorePackageSettleExcelModel {
 	@ExcelProperty("实际结算金额")
 	private BigDecimal settleAmount;
 
+	/**
+	 * 实际支付金额
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("实际支付金额")
+	private BigDecimal actualAmount;
+
 	/**
 	 * 结算状态
 	 */