From f76bf27bf93e523ae4572d9e10e9ca541c324185 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 03 十一月 2026 17:18:55 +0800
Subject: [PATCH] 部分改动
---
src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java b/src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java
index 2c21be4..952c114 100644
--- a/src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/projectManagement/service/impl/InfoServiceImpl.java
@@ -24,6 +24,7 @@
import lombok.SneakyThrows;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -84,6 +85,7 @@
LambdaUpdateWrapper<Info> updateWrapper = new LambdaUpdateWrapper<Info>();
updateWrapper.eq(Info::getId, id);
updateWrapper.set(Info::getIsDelete, IsDeleteEnum.DELETED.getCode());
+ infoMapper.update(null, updateWrapper);
// 瀵瑰簲闄勮〃淇℃伅鏄惁鍒犻櫎寰呯‘瀹氾紙鍥犱负鍚庣画鍙兘浼氳繘琛屽紩鐢ㄦ墍浠ュ厛涓嶅垹闄�
}
@@ -103,24 +105,27 @@
CompletableFuture<SaveInfoDto> infoFuture = CompletableFuture.supplyAsync(() -> infoHandleService.getInfoById(id));
CompletableFuture<ContractInfoDto> contractFuture = CompletableFuture.supplyAsync(() -> contractInfoHandleService.getByInfoId(id));
CompletableFuture<ShippingAddressDto> shippingFuture = CompletableFuture.supplyAsync(() -> shippingAddressHandleService.getByInfoId(id));
+ // 鍟嗗搧
CompletableFuture<List<SalesLedgerProduct>> listCompletableFuture = CompletableFuture.supplyAsync(() -> salesLedgerService.getSalesLedgerProductListByRelateId(id,SaleEnum.MANAGEMENT));
- // 鍟嗗搧
+ // 涓嬬骇椤圭洰淇℃伅
+ CompletableFuture<List<SaveInfoDto>> subordinateInfoListFuture = CompletableFuture.supplyAsync(() -> infoHandleService.getSubordinateInfo(id));
+
// 绛夊緟鎵�鏈夊紓姝ュ畬鎴�
- CompletableFuture.allOf(infoFuture, contractFuture, shippingFuture).join();
+ CompletableFuture.allOf(infoFuture, contractFuture, shippingFuture,listCompletableFuture,subordinateInfoListFuture).join();
SaveInfoDto info = infoFuture.get();
ContractInfoDto contract = contractFuture.get();
ShippingAddressDto shippingAddress = shippingFuture.get();
List<SalesLedgerProduct> salesLedgerProductList = listCompletableFuture.get();
-
+ List<SaveInfoDto> saveInfoDtos = subordinateInfoListFuture.get();
InfoVo vo = new InfoVo();
vo.setInfo(info);
vo.setContractInfo(contract);
vo.setShippingAddress(shippingAddress);
vo.setSalesLedgerProductList(salesLedgerProductList);
-
+ vo.setSubordinateInfoList(saveInfoDtos);
return vo;
}
--
Gitblit v1.9.3