From 56e93995da774627fc275bfd433151a1b3b26f5f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 22 八月 2026 16:02:17 +0800
Subject: [PATCH] refactor(database): 优化多处查询排序字段
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index d19edad..b3a7727 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -38,6 +38,8 @@
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.purchase.dto.SimpleReturnOrderGroupDto;
+import com.ruoyi.purchase.mapper.PurchaseReturnOrderProductsMapper;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.sales.dto.*;
import com.ruoyi.sales.mapper.CommonFileMapper;
@@ -119,6 +121,9 @@
@Autowired
private ProductionProductMainService productionProductMainService;
@Autowired
+ private PurchaseReturnOrderProductsMapper purchaseReturnOrderProductsMapper;
+ ;
+ @Autowired
private SysUserMapper sysUserMapper;
@Override
@@ -143,11 +148,17 @@
productWrapper.eq(SalesLedgerProduct::getType, type.getCode());
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(productWrapper);
if (type.equals(SaleEnum.PURCHASE)) {
+ // 鏌ヨ閫�璐т俊鎭�
+ List<Long> productIds = salesLedgerProducts.stream().map(SalesLedgerProduct::getProductModelId).collect(Collectors.toList());
+ List<SimpleReturnOrderGroupDto> groupListByProductIds = new ArrayList<>();
+ if(CollectionUtils.isNotEmpty(productIds)){
+ groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
+ }
+ Map<Long, BigDecimal> returnOrderGroupDtoMap = groupListByProductIds.stream().collect(Collectors.toMap(SimpleReturnOrderGroupDto::getProductModelId, SimpleReturnOrderGroupDto::getSumReturnQuantity));
salesLedgerProducts.forEach(item -> {
- BigDecimal returnQuantity = item.getReturnQuantity() == null ? BigDecimal.ZERO : item.getReturnQuantity();
- item.setReturnQuantity(returnQuantity);
- BigDecimal quantity = item.getQuantity() == null ? BigDecimal.ZERO : item.getQuantity();
- item.setAvailableQuality(quantity.subtract(returnQuantity));
+ BigDecimal returnQuality = returnOrderGroupDtoMap.getOrDefault(item.getProductModelId(), BigDecimal.ZERO);
+ item.setReturnQuality(returnQuality);
+ item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
});
}
return salesLedgerProducts;
@@ -590,18 +601,7 @@
);
}
- // 5. 鍏滃簳锛氱‘淇濆疄闄呭悎鍚岄噾棰濇湁鍒濆鍊肩瓑浜庡悎鍚岄噾棰�
- if (salesLedger.getNetContractAmount() == null) {
- SalesLedger dbLedger = salesLedgerMapper.selectById(salesLedger.getId());
- if (dbLedger != null && dbLedger.getNetContractAmount() == null && dbLedger.getContractAmount() != null) {
- SalesLedger updateEntity = new SalesLedger();
- updateEntity.setId(salesLedger.getId());
- updateEntity.setNetContractAmount(dbLedger.getContractAmount());
- salesLedgerMapper.updateById(updateEntity);
- }
- }
-
- // 6. 淇濆瓨閿�鍞彴璐﹂檮浠�
+ // 5. 淇濆瓨閿�鍞彴璐﹂檮浠�
fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.SALES_LEDGER, salesLedger.getId(), salesLedgerDto.getStorageBlobDTOs());
return 1;
@@ -738,15 +738,6 @@
Field amountField = mainEntityClass.getDeclaredField("contractAmount");
amountField.setAccessible(true);
amountField.set(entity, totalAmount);
-
- // 瀹為檯鍚堝悓閲戦鍒濆鍊肩瓑浜庡悎鍚岄噾棰�
- try {
- Field netAmountField = mainEntityClass.getDeclaredField("netContractAmount");
- netAmountField.setAccessible(true);
- netAmountField.set(entity, totalAmount);
- } catch (NoSuchFieldException ignored) {
- // 瀛愮被鍙兘娌℃湁璇ュ瓧娈碉紝蹇界暐
- }
mainMapper.updateById(entity);
} catch (Exception e) {
--
Gitblit v1.9.3