From 4635770544e2d57416ad88a8983ee293919f5fec Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 52 ++++------------------------------------------------
1 files changed, 4 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index c8b53b6..09d5d20 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -6,12 +6,8 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.approve.bean.dto.ApprovalInstanceDto;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
-import com.ruoyi.approve.mapper.ApprovalTemplateMapper;
-import com.ruoyi.approve.pojo.ApprovalInstance;
import com.ruoyi.approve.pojo.ApproveProcess;
-import com.ruoyi.approve.service.ApprovalInstanceService;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.basic.enums.ApplicationTypeEnum;
import com.ruoyi.basic.enums.RecordTypeEnum;
@@ -104,8 +100,6 @@
private final ApproveProcessServiceImpl approveProcessService;
private final ProcurementRecordMapper procurementRecordStorageMapper;
private final FileUtil fileUtil;
- private final ApprovalInstanceService approvalInstanceService;
- private final ApprovalTemplateMapper approvalTemplateMapper;
@Override
public List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger) {
@@ -156,7 +150,7 @@
if (purchaseLedger.getId() == null) {
purchaseLedgerMapper.insert(purchaseLedger);
} else {
-// // 鍒犻櫎閲囪喘瀹℃牳锛岄噸鏂版彁浜�
+ // 鍒犻櫎閲囪喘瀹℃牳锛岄噸鏂版彁浜�
ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
.eq(ApproveProcess::getApproveType, 5)
.eq(ApproveProcess::getApproveReason, purchaseLedger.getPurchaseContractNumber())
@@ -166,22 +160,8 @@
approveProcessService.delByIds(Collections.singletonList(one.getId()));
}
purchaseLedgerMapper.updateById(purchaseLedger);
- //鍒犻櫎鏂伴噰璐鎵�
- approvalInstanceService.remove(new LambdaQueryWrapper<ApprovalInstance>().eq(ApprovalInstance::getBusinessId, purchaseLedger.getId()).eq(ApprovalInstance::getBusinessType, 5));
}
- //鏂伴噰璐鎵�
- ApprovalInstanceDto approvalInstanceDto = new ApprovalInstanceDto();
- approvalInstanceDto.setTemplateId(purchaseLedger.getTemplateId());
- approvalInstanceDto.setBusinessId(purchaseLedger.getId());
- approvalInstanceDto.setBusinessType(5L);
- approvalInstanceDto.setTitle("閲囪喘鍚堝悓鍙凤細" + purchaseLedger.getPurchaseContractNumber());
- approvalInstanceDto.setApplicantId(SecurityUtils.getUserId());
- approvalInstanceDto.setTemplateId(purchaseLedger.getTemplateId());
- approvalInstanceDto.setTemplateName(approvalTemplateMapper.selectById(purchaseLedger.getTemplateId()).getTemplateName());
- approvalInstanceDto.setApplicantName(SecurityUtils.getLoginUser().getNickName());
- approvalInstanceDto.setApplyTime(LocalDateTime.now());
- approvalInstanceService.add(approvalInstanceDto);
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
@@ -471,31 +451,7 @@
@Override
public IPage<PurchaseLedgerDto> selectPurchaseLedgerListPage(IPage ipage, PurchaseLedgerDto purchaseLedger) {
- IPage<PurchaseLedgerDto> purchaseLedgerDtoIPage = purchaseLedgerMapper.selectPurchaseLedgerListPage(ipage, purchaseLedger);
- List<PurchaseLedgerDto> records = purchaseLedgerDtoIPage.getRecords();
- if (records == null || records.isEmpty()) {
- return purchaseLedgerDtoIPage;
- }
-
- // 鎵归噺鏌ヨ鏂囦欢锛岄伩鍏� N+1 闂
- List<Long> ledgerIds = records.stream()
- .map(PurchaseLedgerDto::getId)
- .filter(Objects::nonNull)
- .collect(Collectors.toList());
-
- if (!ledgerIds.isEmpty()) {
- List<CommonFile> allFiles = commonFileMapper.selectList(
- new LambdaQueryWrapper<CommonFile>()
- .in(CommonFile::getCommonId, ledgerIds)
- .eq(CommonFile::getType, FileNameType.PURCHASE.getValue())
- );
-
- Map<Long, List<CommonFile>> fileMap = allFiles.stream()
- .collect(Collectors.groupingBy(CommonFile::getCommonId));
-
- records.forEach(dto -> dto.setSalesLedgerFiles(fileMap.getOrDefault(dto.getId(), new ArrayList<>())));
- }
- return purchaseLedgerDtoIPage;
+ return purchaseLedgerMapper.selectPurchaseLedgerListPage(ipage, purchaseLedger);
}
@Override
@@ -625,9 +581,9 @@
return AjaxResult.success("瀵煎叆鎴愬姛");
} catch (Exception e) {
- log.error("PurchaseLedgerServiceImpl importData error", e);
- return AjaxResult.error("瀵煎叆澶辫触: " + e.getMessage());
+ e.printStackTrace();
}
+ return AjaxResult.success("瀵煎叆澶辫触");
}
@Override
--
Gitblit v1.9.3