From ab01a0f611c0adb97662bc8f548ca4a911ec8045 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 17:37:39 +0800
Subject: [PATCH] 分页修改
---
src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java | 138 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 127 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java
index f9a2487..ee93b39 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/InvoicePurchaseServiceImpl.java
@@ -2,15 +2,29 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.other.mapper.TempFileMapper;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.purchase.dto.InvoicePurchaseDto;
import com.ruoyi.purchase.mapper.InvoicePurchaseMapper;
+import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.InvoicePurchase;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.service.IInvoicePurchaseService;
-import lombok.AllArgsConstructor;
+import com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.pojo.CommonFile;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
-import java.util.Arrays;
-import java.util.List;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 鍙戠エ淇℃伅Service涓氬姟灞傚鐞�
@@ -19,14 +33,80 @@
* @date 2025-05-14
*/
@Service
-@AllArgsConstructor
+@RequiredArgsConstructor
+@Slf4j
public class InvoicePurchaseServiceImpl extends ServiceImpl<InvoicePurchaseMapper, InvoicePurchase> implements IInvoicePurchaseService {
- private InvoicePurchaseMapper invoicePurchaseMapper;
+ private final InvoicePurchaseMapper invoicePurchaseMapper;
+
+ private final PurchaseLedgerMapper purchaseLedgerMapper;
+
+ private final SysUserMapper userMapper;
+
+ private final CommonFileMapper commonFileMapper;
+
+ private final TempFileMapper tempFileMapper;
+
+ @Value("${file.upload-dir}")
+ private String uploadDir;
@Override
- public List<InvoicePurchase> selectInvoicePurchaseList(InvoicePurchase invoicePurchase) {
- return invoicePurchaseMapper.selectList(new LambdaQueryWrapper<>());
+ public List<InvoicePurchaseDto> selectInvoicePurchaseList(InvoicePurchaseDto invoicePurchaseDto) {
+ // 鏋勫缓鍙戠エ鏌ヨ鏉′欢
+ LambdaQueryWrapper<InvoicePurchase> queryWrapper = new LambdaQueryWrapper<>();
+ Optional.ofNullable(invoicePurchaseDto)
+ .ifPresent(dto -> {
+ if (StringUtils.hasText(dto.getPurchaseContractNo())) {
+ queryWrapper.like(InvoicePurchase::getPurchaseContractNo, dto.getPurchaseContractNo());
+ }
+ if (StringUtils.hasText(dto.getSupplierName())) {
+ queryWrapper.like(InvoicePurchase::getSupplierName, dto.getSupplierName());
+ }
+ // 澶勭悊鏃ユ湡绫诲瀷瀛楁
+ if (dto.getIssueDate() != null) {
+ queryWrapper.eq(InvoicePurchase::getIssueDate,invoicePurchaseDto.getIssueDate());
+ }
+ });
+
+ // 鏌ヨ鍙戠エ鍒楄〃
+ List<InvoicePurchase> invoiceList = invoicePurchaseMapper.selectList(queryWrapper);
+
+ // 濡傛灉娌℃湁鏌ヨ鍒板彂绁紝鐩存帴杩斿洖绌哄垪琛�
+ if (CollectionUtils.isEmpty(invoiceList)) {
+ return Collections.emptyList();
+ }
+
+ // 鎻愬彇鎵�鏈夊彂绁↖D
+ List<Long> invoiceIds = invoiceList.stream()
+ .map(InvoicePurchase::getId)
+ .collect(Collectors.toList());
+
+ // 鎵归噺鏌ヨ杩欎簺鍙戠エ鍏宠仈鐨勬枃浠朵俊鎭�
+ LambdaQueryWrapper<CommonFile> fileQueryWrapper = new LambdaQueryWrapper<>();
+ fileQueryWrapper.in(CommonFile::getCommonId, invoiceIds)
+ .eq(CommonFile::getType,"3");
+ List<CommonFile> fileList = commonFileMapper.selectList(fileQueryWrapper);
+
+ // 灏嗘枃浠朵俊鎭槧灏勫埌瀵瑰簲鐨勫彂绁↖D
+ Map<Long, String> fileMap = fileList.stream()
+ .collect(Collectors.toMap(
+ CommonFile::getCommonId,
+ CommonFile::getName,
+ (existing, replacement) -> existing // 濡傛灉鏈夊涓枃浠讹紝鍙栫涓�涓�
+ ));
+
+ // 灏嗘枃浠朵俊鎭缃埌鍙戠エDTO涓�
+ List<InvoicePurchaseDto> resultList = new ArrayList<>();
+ for (InvoicePurchase invoice : invoiceList) {
+ InvoicePurchaseDto dto = new InvoicePurchaseDto();
+ // 灏咺nvoicePurchase鐨勫睘鎬у鍒跺埌DTO
+ BeanUtils.copyProperties(invoice, dto);
+ // 璁剧疆鏂囦欢鍚嶏紝濡傛灉瀛樺湪鐨勮瘽
+ dto.setFileName(fileMap.getOrDefault(invoice.getId(), null));
+ resultList.add(dto);
+ }
+
+ return resultList;
}
@Override
@@ -35,11 +115,47 @@
}
@Override
- public int addOrUpdateInvoice(InvoicePurchase invoicePurchase) {
- if (invoicePurchase.getId() == null) {
- return invoicePurchaseMapper.insert(invoicePurchase);
+ public int addOrUpdateInvoice(InvoicePurchaseDto invoicePurchaseDto) throws IOException {
+ int i;
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(invoicePurchaseDto.getPurchaseLedgerId());
+ InvoicePurchase invoicePurchase = new InvoicePurchase();
+ BeanUtils.copyProperties(invoicePurchaseDto, invoicePurchase);
+ invoicePurchase.setPurchaseContractNo(purchaseLedger.getPurchaseContractNumber());
+ invoicePurchase.setSalesContractNo(purchaseLedger.getSalesContractNo());
+ SysUser sysUser = userMapper.selectUserById(invoicePurchase.getIssUerId());
+ invoicePurchase.setIssUer(sysUser.getNickName());
+ invoicePurchase.setTenantId(purchaseLedger.getTenantId());
+ if (invoicePurchaseDto.getId() == null) {
+ i = invoicePurchaseMapper.insert(invoicePurchase);
} else {
- return invoicePurchaseMapper.updateById(invoicePurchase);
+ i = invoicePurchaseMapper.updateById(invoicePurchase);
}
+
+ // 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
+// if (invoicePurchaseDto.getTempFileIds() != null && !invoicePurchaseDto.getTempFileIds().isEmpty()) {
+// migrateTempFilesToFormal(invoicePurchase.getId(), invoicePurchaseDto.getTempFileIds());
+// }
+
+ return i;
+ }
+
+ @Override
+ public InvoicePurchaseDto getInvoiceById(InvoicePurchaseDto invoicePurchaseDto) {
+ InvoicePurchase invoicePurchase = invoicePurchaseMapper.selectById(invoicePurchaseDto.getId());
+ InvoicePurchaseDto resultDto = new InvoicePurchaseDto();
+ BeanUtils.copyProperties(invoicePurchase, resultDto);
+
+ // 鏌ヨ涓婁紶鏂囦欢
+ LambdaQueryWrapper<CommonFile> commonFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ commonFileLambdaQueryWrapper.eq(CommonFile::getCommonId, invoicePurchaseDto.getId())
+ .eq(CommonFile::getType, "3");
+ List<CommonFile> commonFiles = commonFileMapper.selectList(commonFileLambdaQueryWrapper);
+ resultDto.setCommonFiles(commonFiles);
+ return resultDto;
+ }
+
+ @Override
+ public List<InvoicePurchase> selectInvoicePurchaseLists(InvoicePurchase invoicePurchase) {
+ return invoicePurchaseMapper.selectList(new LambdaQueryWrapper<>());
}
}
--
Gitblit v1.9.3