From d6f2f458d9c8156981880c987d861423ce9af146 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 14 六月 2023 16:42:08 +0800
Subject: [PATCH] 修改类型

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index 0bff6a2..f5ea118 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -3,7 +3,6 @@
 import java.util.HashMap;
 import java.util.List;
 
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.bean.DtoConversionUtils;
 import com.ruoyi.project.domain.*;
 import com.ruoyi.project.domain.dto.ServiceReimbursementDto;
@@ -18,11 +17,11 @@
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import java.util.ArrayList;
 import java.util.Map;
 
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.project.service.IServiceReimbursementService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 鎶ラ攢鐢宠Service涓氬姟灞傚鐞�
@@ -35,9 +34,6 @@
 
     @Autowired
     ServiceReimbursementMapper serviceReimbursementMapper;
-
-    @Autowired
-    ServiceReimbursementSharedMapper serviceReimbursementShareMapper;
 
     @Autowired
     ServiceReimbursementdetailMapper serviceReimbursementdetailMapper;
@@ -112,6 +108,7 @@
     }
 
     @Override
+    @Transactional
     public Boolean addSharedData(Long id) {
         ServiceReimbursement serviceReimbursement = serviceReimbursementMapper.selectById(id);
         Map<String, Object> columnMap = new HashMap<>();
@@ -122,11 +119,27 @@
         List<ServiceReimbursementpayee> serviceReimbursementpayees = reimbursementpayeeMapper.selectByMap(columnMap);
         //鏁版嵁缁勮
         ServiceReimbursementShared serviceReimbursementShared = DtoConversionUtils.sourceToTarget(serviceReimbursement, ServiceReimbursementShared.class);
+        serviceReimbursementShared.setReimid(id);
+        serviceReimbursementShared.setId(null);
         List<ServiceReimbursementdetailShared> serviceReimbursementdetailShareds = DtoConversionUtils.sourceToTarget(details, ServiceReimbursementdetailShared.class);
         List<ServiceReimbursementpayeeShared> serviceReimbursementpayeeShareds = DtoConversionUtils.sourceToTarget(serviceReimbursementpayees, ServiceReimbursementpayeeShared.class);
         //灏嗙粍瑁呭ソ鐨勬暟鎹彃鍏ュ埌鍒嗕韩琛ㄤ腑
         sharedService.save(serviceReimbursementShared);
+
+        //灏唖erviceReimbursementdetail琛ㄩ噷鐨刬d璧嬪�肩粰Rdid; 灏唖erviceReimbursementShared閲岀殑ID璧嬪�肩粰RBID,骞跺皢serviceReimbursementdetailShared琛ㄩ噷鐨刬d缃┖锛岀敱鏁版嵁搴撻噸鏂扮敓鎴�
+        for (int i = 0; i < details.size(); i++) {
+            serviceReimbursementdetailShareds.get(i).setRdid(serviceReimbursementdetailShareds.get(i).getId());
+            serviceReimbursementdetailShareds.get(i).setRbid(serviceReimbursementShared.getId());
+            serviceReimbursementdetailShareds.get(i).setId(null);
+        }
         detailSharedService.saveBatch(serviceReimbursementdetailShareds);
+
+        //灏唖erviceReimbursementpayee琛ㄩ噷鐨刬d璧嬪�肩粰Rpid; 灏唖erviceReimbursementShared閲岀殑ID璧嬪�肩粰RBID,骞跺皢serviceReimbursementpayeeShared琛ㄩ噷鐨刬d缃┖锛岀敱鏁版嵁搴撻噸鏂扮敓鎴�
+        for (int i = 0; i < serviceReimbursementpayees.size(); i++) {
+            serviceReimbursementpayeeShareds.get(i).setRpid(Long.valueOf(serviceReimbursementpayees.get(i).getId()));
+            serviceReimbursementpayeeShareds.get(i).setRbid(serviceReimbursementShared.getId());
+            serviceReimbursementpayeeShareds.get(i).setId(null);
+        }
         payeeSharedService.saveBatch(serviceReimbursementpayeeShareds);
 
         return true;

--
Gitblit v1.9.3