From 5de1bac1d9b090ab3a7b2d0dfcdab3ad1286e24e Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Sun, 18 Aug 2024 15:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=B0=E9=87=91=E6=94=AF?=
 =?UTF-8?q?=E5=87=BA=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java    | 6 ++++++
 .../yudao/module/bpm/service/oa/BpmOACashServiceImpl.java  | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java
index 23a0620c..7aa48038 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOACashDO.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -44,6 +45,11 @@ public class BpmOACashDO extends BaseDO {
      */
     private Long bankId;
 
+    /**
+     * 支出总金额
+     */
+    private BigDecimal totalMoney;
+
     /**
      * 用章的结果
      *
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java
index 7dd6166d..37a6c3d4 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOACashServiceImpl.java
@@ -118,6 +118,9 @@ public class BpmOACashServiceImpl extends BpmOABaseService implements BpmOACashS
 
         validateLeaveExists(id);
 
+        // 获得现金支出业务数据
+        BpmOACashDO cash = getCash(id);
+
         // 获取现金支出明细
         List<BpmOACashItemDO> cashItemDOs = getCashItem(id);
 
@@ -130,11 +133,13 @@ public class BpmOACashServiceImpl extends BpmOABaseService implements BpmOACashS
             if (instance.isEnded()) {
 
                 //判断是否有采购报销
+                StringBuilder reason = new StringBuilder();
                 for (BpmOACashItemDO cashItemDO : cashItemDOs) {
 
                     if (cashItemDO.getType() == 4) {
                         procureIds.add(cashItemDO.getProcureId());
                     }
+                    reason.append(cashItemDO.getReason()).append("，");
                 }
                 //报销类别为 采购费时
                 if (!CollectionUtil.isEmpty(procureIds)) {
@@ -151,7 +156,7 @@ public class BpmOACashServiceImpl extends BpmOABaseService implements BpmOACashS
                 financialPaymentService.save(new FinancialPaymentDO()
                         .setUserId(cash.getUserId())
                         .setProcessInstanceId(cash.getProcessInstanceId())
-                        .setReason(cash.getReason())
+                        .setReason(reason.toString())
                         .setObjectId(id)
                         .setType(1)
                         .setStatus(0)