From e79d08a018f38abed5f22c73be2cac8aaed37fac Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Tue, 8 Aug 2023 09:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E5=AE=A1=E6=89=B9=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=97=A5=E5=BF=97=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TbsActivityServiceImpl.java    |  1 +
 .../vtb/service/VtbVerificationApplication.java | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
index f36a6e4f..0e8be7e7 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
@@ -543,6 +543,7 @@ public class TbsActivityServiceImpl extends ServiceImpl<TbsActivityMapper,TbsAct
                 activityCenterList.add(activityCenter);
             }
             if(activitySubject.getAmount().compareTo(totalAmount)!=0){
+                //log.error("成本中心费用入参有误--amount:{},activitySubject:{}",totalAmount,JsonUtil.objectToJson(activitySubject));
                 Assert.throwEx("成本中心费用入参有误");
             }
             if(totalRate.compareTo(new BigDecimal(100))!=0){
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
index 454f3908..b984b31e 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
@@ -12,6 +12,7 @@ import com.qs.serve.modules.seeyon.entity.CtpAffair;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysPostUser;
 import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.mapper.SysAttachMapper;
 import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
@@ -42,6 +43,7 @@ import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -393,6 +395,10 @@ public class VtbVerificationApplication {
         Map<String,List<SysPostUser>> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId));
 
         List<CtpAffairVo> result = new ArrayList<>();
+        DataAffairCommitMapper dataAffairCommitMapper = SpringUtils.getBean(DataAffairCommitMapper.class);
+        SysAttachMapper sysAttachMapper = SpringUtils.getBean(SysAttachMapper.class);
+        List<DataAffairCommit> affairCommits = dataAffairCommitMapper.selectBatchIds(ctpAffairs.stream()
+                .map(CtpAffair::getAffairId).collect(Collectors.toList()));
         for (CtpAffair ctpAffair : ctpAffairs) {
             CtpAffairVo ctpAffairVo = new CtpAffairVo();
             for (VtbVerification verification : vtbVerificationList) {
@@ -427,7 +433,16 @@ public class VtbVerificationApplication {
                     ctpAffairVo.setUserPostList(postUsers);
                 }
             }
-
+            for (DataAffairCommit affairCommit : affairCommits) {
+                if(affairCommit.getId().equals(ctpAffair.getAffairId())){
+                    ctpAffairVo.setCommitInfo(affairCommit);
+                    if(CollectionUtil.isNotEmpty(affairCommit.getAttachIds())){
+                        ctpAffairVo.setAttachments(
+                                sysAttachMapper.selectBatchIds(
+                                        Arrays.asList(affairCommit.getAttachIds())));
+                    }
+                }
+            }
             ctpAffairVo.setAffairInfo(ctpAffair);
             result.add(ctpAffairVo);
         }