From 15df1becdf4547780edd6d817833064459cd0d80 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Fri, 27 Sep 2024 22:51:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E9=87=91=E7=94=B3?=
 =?UTF-8?q?=E9=A2=86API=E4=BB=A5=E8=8E=B7=E5=8F=96=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/oa/BpmOAAssetClaimController.java   | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAAssetClaimController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAAssetClaimController.java
index 49b9bac7..4ea694a7 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAAssetClaimController.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAAssetClaimController.java
@@ -4,6 +4,8 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimCreateReqVO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.BpmOAAssetClaimRespVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.Receive;
+import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.assetClaim.ReceiveRespVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAAssetClaimDO;
 import cn.iocoder.yudao.module.bpm.service.oa.BpmOAAssetClaimService;
 import cn.iocoder.yudao.module.system.api.assets.AssetsTypeApi;
@@ -17,7 +19,13 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - OA 资金申领")
@@ -46,10 +54,16 @@ public class BpmOAAssetClaimController {
 
         BpmOAAssetClaimDO assetClaimDO = assetClaimService.getAssetClaim(id);
 
-        AssetsTypeDTO assetsTypeDTO = assetsTypeApi.get(assetClaimDO.getAssetsTypeId()).getCheckedData();
+        List<AssetsTypeDTO> assetsTypeDTO = assetsTypeApi.getList(convertList(assetClaimDO.getReceive(), Receive::getAssetsTypeId)).getCheckedData();
+        Map<Long, String> assetsTypeNameMap = convertMap(assetsTypeDTO, AssetsTypeDTO::getId, AssetsTypeDTO::getName);
+
+        List<ReceiveRespVO> respVOS = assetClaimDO.getReceive().stream()
+                .map(item -> BeanUtils.toBean(item, ReceiveRespVO.class)
+                        .setAssetsTypeName(assetsTypeNameMap.get(item.getAssetsTypeId())))
+                .collect(Collectors.toList());
 
         return success(BeanUtils.toBean(assetClaimDO, BpmOAAssetClaimRespVO.class)
-                .setAssetsTypeName(assetsTypeDTO.getName()));
+                .setReceive(respVOS));
     }
 
     @GetMapping("/getByProcessInstanceId")
@@ -59,9 +73,15 @@ public class BpmOAAssetClaimController {
 
         BpmOAAssetClaimDO assetClaimDO = assetClaimService.getByProcessInstanceId(processInstanceId);
 
-        AssetsTypeDTO assetsTypeDTO = assetsTypeApi.get(assetClaimDO.getAssetsTypeId()).getCheckedData();
+        List<AssetsTypeDTO> assetsTypeDTO = assetsTypeApi.getList(convertList(assetClaimDO.getReceive(), Receive::getAssetsTypeId)).getCheckedData();
+        Map<Long, String> assetsTypeNameMap = convertMap(assetsTypeDTO, AssetsTypeDTO::getId, AssetsTypeDTO::getName);
+
+        List<ReceiveRespVO> respVOS = assetClaimDO.getReceive().stream()
+                .map(item -> BeanUtils.toBean(item, ReceiveRespVO.class)
+                        .setAssetsTypeName(assetsTypeNameMap.get(item.getAssetsTypeId())))
+                .collect(Collectors.toList());
 
         return success(BeanUtils.toBean(assetClaimDO, BpmOAAssetClaimRespVO.class)
-                .setAssetsTypeName(assetsTypeDTO.getName()));
+                .setReceive(respVOS));
     }
 }