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

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

@@ -19,6 +19,7 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -1556,6 +1557,16 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 					}
 					ouPut.setSettleAmount(tmp);
 				}
+
+				// 实际结算金额
+				BigDecimal acAmtTmp = BigDecimal.ZERO;
+				for (WmScorePackageSettleNote note : packageSettleNoteList) {
+					if (null != note.getActualAmount()) {
+						acAmtTmp = acAmtTmp.add(note.getActualAmount());
+					}
+				}
+				ouPut.setActualAmount(acAmtTmp.compareTo(BigDecimal.ZERO) == 0 ? null : acAmtTmp);
+
 				if (StringUtils.isBlank(ouPut.getSettleStatus())) {
 					ouPut.setSettleStatus(String.valueOf(settleNote.getSettleNoteStatus()));
 				}