From dc3336685e80c593a3654a6e53e3e1d1d13b2b50 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 15:30:13 +0800
Subject: [PATCH] fix(approve): 修复流程配置节点审批人为空时的异常处理
---
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 251 ++++++++++++++++++++++++--------------------------
1 files changed, 120 insertions(+), 131 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index 4d06156..a98d924 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.purchase.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -13,7 +14,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.other.mapper.TempFileMapper;
-import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
@@ -33,25 +33,17 @@
import com.ruoyi.sales.service.ISalesLedgerProductService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.math.BigDecimal;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -77,14 +69,9 @@
private final ProductRecordMapper productRecordMapper;
- @Autowired
- private ISalesLedgerProductService salesLedgerProductService;
+ private final ISalesLedgerProductService salesLedgerProductService;
- @Autowired
- private PaymentRegistrationMapper paymentRegistrationMapper;
-
- @Value("${file.upload-dir}")
- private String uploadDir;
+ private final PaymentRegistrationMapper paymentRegistrationMapper;
@Override
@@ -135,7 +122,7 @@
BeanUtils.copyProperties(ticketRegistrationDto, ticketRegistration);
ticketRegistration.setPurchaseContractNumber(purchaseLedger.getPurchaseContractNumber());
ticketRegistration.setTenantId(purchaseLedger.getTenantId());
- ticketRegistration.setIssueDate(ticketRegistrationDto.getIssueDate());
+ ticketRegistration.setIssueDate(ticketRegistrationDto.getEntryDate());
ticketRegistration.setContractAmount(purchaseLedger.getContractAmount());
ticketRegistration.setSalesLedgerId(purchaseLedger.getSalesLedgerId());
ticketRegistration.setEnterDate(ticketRegistrationDto.getEnterDate());
@@ -162,6 +149,14 @@
productRecord.setPurchaseLedgerId(ticketRegistrationDto.getPurchaseLedgerId());
productRecord.setCreatedAt(DateUtils.getNowDate());
BeanUtils.copyProperties(salesLedgerProduct, productRecord);
+ //鍚屾鏇存柊鍏朵粬鍓╀綑鏁伴噺鍜岄噾棰�
+ productRecordMapper.update(
+ null,
+ new LambdaUpdateWrapper<ProductRecord>()
+ .eq(ProductRecord::getPurchaseLedgerId, ticketRegistrationDto.getPurchaseLedgerId())
+ .set(ProductRecord::getFutureTickets, salesLedgerProduct.getFutureTickets())
+ .set(ProductRecord::getFutureTicketsAmount, salesLedgerProduct.getFutureTicketsAmount())
+ );
productRecord.setSaleLedgerProjectId(salesLedgerProduct.getId());
productRecord.setId(null);
productRecord.setType("2");
@@ -172,129 +167,123 @@
throw new RuntimeException("浜у搧寮�绁ㄦ暟閮戒负0锛岃妫�鏌�");
}
}
- // 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
- if (ticketRegistrationDto.getTempFileIds() != null && !ticketRegistrationDto.getTempFileIds().isEmpty()) {
- migrateTempFilesToFormal(ticketRegistration.getId(), ticketRegistrationDto.getTempFileIds());
- }
return rowsAffected;
}
- /**
- * 灏嗕复鏃舵枃浠惰縼绉诲埌姝ｅ紡鐩綍
- *
- * @param businessId 涓氬姟ID锛堥攢鍞彴璐D锛�
- * @param tempFileIds 涓存椂鏂囦欢ID鍒楄〃
- * @throws IOException 鏂囦欢鎿嶄綔寮傚父
- */
- public void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException {
- if (CollectionUtils.isEmpty(tempFileIds)) {
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int delRegistration(Long[] ids) {
+
+ // 鏌ヨ瑕佸垹闄ょ殑浜у搧鏉ョエ璁板綍
+ LambdaQueryWrapper<ProductRecord> productWrapper = new LambdaQueryWrapper<>();
+ productWrapper.in(ProductRecord::getId, Arrays.asList(ids));
+ List<ProductRecord> productRecords = productRecordMapper.selectList(productWrapper);
+
+ if (CollectionUtils.isEmpty(productRecords)) {
+ return 0;
+ }
+
+ // 鏀堕泦鍏宠仈ID
+ Set<Long> ticketRegistrationIds = productRecords.stream()
+ .map(ProductRecord::getTicketRegistrationId)
+ .collect(Collectors.toSet());
+
+ Set<Long> salesLedgerProductIds = productRecords.stream()
+ .map(ProductRecord::getSaleLedgerProjectId)
+ .collect(Collectors.toSet());
+
+ // 鏌ヨ鏉ョエ鐧昏
+ List<TicketRegistration> ticketRegistrations =
+ ticketRegistrationMapper.selectBatchIds(ticketRegistrationIds);
+
+ // 澶勭悊鏉ョエ鐧昏閲戦銆佷粯娆炬祦姘�
+ for (TicketRegistration ticket : ticketRegistrations) {
+
+ // 璇ユ潵绁ㄧ櫥璁颁笅鎵�鏈変骇鍝佽褰�
+ List<ProductRecord> recordsOfTicket = productRecords.stream()
+ .filter(r -> r.getTicketRegistrationId().equals(ticket.getId()))
+ .collect(Collectors.toList());
+
+ // 璁＄畻瑕佸洖閫�鐨勯噾棰�
+ BigDecimal rollbackAmount = recordsOfTicket.stream()
+ .map(ProductRecord::getTicketsAmount)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ BigDecimal remain = ticket.getInvoiceAmount().subtract(rollbackAmount);
+
+ if (remain.compareTo(BigDecimal.ZERO) <= 0) {
+ // 鍒犻櫎鏉ョエ鐧昏
+ ticketRegistrationMapper.deleteById(ticket.getId());
+ // 鍒犻櫎浠樻娴佹按
+ paymentRegistrationMapper.delete(
+ new LambdaQueryWrapper<PaymentRegistration>()
+ .eq(PaymentRegistration::getTicketRegistrationId, ticket.getId())
+ );
+ } else {
+ ticket.setInvoiceAmount(remain);
+ ticketRegistrationMapper.updateById(ticket);
+ }
+ }
+
+ // 鍥為��閿�鍞彴璐︿骇鍝佺殑鏈潵绁�
+ for (ProductRecord record : productRecords) {
+
+ LambdaQueryWrapper<SalesLedgerProduct> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(SalesLedgerProduct::getId, record.getSaleLedgerProjectId())
+ .eq(SalesLedgerProduct::getType, 2);
+
+ SalesLedgerProduct product = salesLedgerProductMapper.selectOne(wrapper);
+ if (product != null) {
+ product.setFutureTickets(
+ product.getFutureTickets().add(record.getTicketsNum())
+ );
+ product.setFutureTicketsAmount(
+ product.getFutureTicketsAmount().add(record.getTicketsAmount())
+ );
+ salesLedgerProductMapper.updateById(product);
+ }
+ }
+
+ // 鍒犻櫎浜у搧鏉ョエ璁板綍
+ productRecordMapper.delete(productWrapper);
+
+ // 閲嶆柊璁＄畻 currentInvoiceAmount
+ for (Long productId : salesLedgerProductIds) {
+ refreshCurrentInvoiceAmount(productId);
+ }
+
+ return 1;
+ }
+
+ private void refreshCurrentInvoiceAmount(Long salesLedgerProductId) {
+
+ // 鏌ヨ璇ヤ骇鍝佹渶鏂颁竴鏉℃潵绁ㄨ褰�
+ LambdaQueryWrapper<ProductRecord> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(ProductRecord::getSaleLedgerProjectId, salesLedgerProductId)
+ .orderByDesc(ProductRecord::getCreatedAt)
+ .last("limit 1");
+
+ ProductRecord latestRecord = productRecordMapper.selectOne(wrapper);
+
+ SalesLedgerProduct product =
+ salesLedgerProductMapper.selectById(salesLedgerProductId);
+
+ if (product == null) {
return;
}
- // 鏋勫缓姝ｅ紡鐩綍璺緞锛堟寜涓氬姟绫诲瀷鍜屾棩鏈熷垎缁勶級
- String formalDir = uploadDir + LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE);
-
- Path formalDirPath = Paths.get(formalDir);
-
- // 纭繚姝ｅ紡鐩綍瀛樺湪锛堥�掑綊鍒涘缓锛�
- if (!Files.exists(formalDirPath)) {
- Files.createDirectories(formalDirPath);
+ if (latestRecord == null) {
+ // 娌℃湁浠讳綍鏉ョエ璁板綍
+ product.setTicketsAmount(BigDecimal.ZERO);
+ } else {
+ // 姘歌繙鍙栨渶鏂颁竴鏉�
+ product.setTicketsAmount(latestRecord.getTicketsAmount());
}
- for (String tempFileId : tempFileIds) {
- // 鏌ヨ涓存椂鏂囦欢璁板綍
- TempFile tempFile = tempFileMapper.selectById(tempFileId);
- if (tempFile == null) {
- log.warn("涓存椂鏂囦欢涓嶅瓨鍦紝璺宠繃澶勭悊: {}", tempFileId);
- continue;
- }
-
- // 鏋勫缓姝ｅ紡鏂囦欢鍚嶏紙鍖呭惈涓氬姟ID鍜屾椂闂存埑锛岄伩鍏嶅啿绐侊級
- String originalFilename = tempFile.getOriginalName();
- String fileExtension = FilenameUtils.getExtension(originalFilename);
- String baseName = FilenameUtils.getBaseName(originalFilename);
- String formalFilename = businessId + "_" +
- System.currentTimeMillis() + "_" +
- UUID.randomUUID().toString().substring(0, 8) +baseName+
- (com.ruoyi.common.utils.StringUtils.hasText(fileExtension) ? "." + fileExtension : "");
-
- Path formalFilePath = formalDirPath.resolve(formalFilename);
-
- try {
- // 鎵ц鏂囦欢杩佺Щ锛堜娇鐢ㄥ師瀛愭搷浣滅‘淇濆畨鍏ㄦ�э級
-// Files.move(
-// Paths.get(tempFile.getTempPath()),
-// formalFilePath,
-// StandardCopyOption.REPLACE_EXISTING,
-// StandardCopyOption.ATOMIC_MOVE
-// );
- // 鍘熷瓙绉诲姩澶辫触锛屼娇鐢ㄥ鍒�+鍒犻櫎
- Files.copy(Paths.get(tempFile.getTempPath()), formalFilePath, StandardCopyOption.REPLACE_EXISTING);
- Files.deleteIfExists(Paths.get(tempFile.getTempPath()));
- log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
-
- // 鏇存柊鏂囦欢璁板綍锛堝叧鑱斿埌涓氬姟ID锛�
- CommonFile fileRecord = new CommonFile();
- fileRecord.setCommonId(businessId);
- fileRecord.setName(originalFilename);
- fileRecord.setUrl(formalFilePath.toString());
- fileRecord.setCreateTime(LocalDateTime.now());
- fileRecord.setType(4);
- commonFileMapper.insert(fileRecord);
-
- log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
- } catch (IOException e) {
- log.error("鏂囦欢杩佺Щ澶辫触: {}", tempFile.getTempPath(), e);
- // 鍙�夋嫨鍥炴粴浜嬪姟鎴栬褰曞け璐ユ枃浠�
- throw new IOException("鏂囦欢杩佺Щ寮傚父", e);
- }
- }
+ salesLedgerProductMapper.updateById(product);
}
-
- @Override
- public int delRegistration(Long[] ids) {
- // 鍒犻櫎閲囪喘鍙拌处浜у搧寮�绁ㄨ褰曞璞�
- LambdaQueryWrapper<ProductRecord> productRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
- productRecordLambdaQueryWrapper.in(ProductRecord::getId, Arrays.asList(ids));
- List<ProductRecord> productRecords = productRecordMapper.selectList(productRecordLambdaQueryWrapper);
- if(CollectionUtils.isEmpty(productRecords)){
- return 0;
- }
- LambdaQueryWrapper<TicketRegistration> ticketRegistrationLambdaQueryWrapper = new LambdaQueryWrapper<>();
- ticketRegistrationLambdaQueryWrapper.in(TicketRegistration::getId, productRecords.stream().map(ProductRecord::getTicketRegistrationId).collect(Collectors.toList()));
- List<TicketRegistration> ticketRegistrations = ticketRegistrationMapper.selectList(ticketRegistrationLambdaQueryWrapper);
-
- // 淇敼浜у搧淇℃伅
- for (ProductRecord productRecord : productRecords) {
- BigDecimal subtract = ticketRegistrations.get(0).getInvoiceAmount().subtract(productRecords.get(0).getTicketsAmount());
- // 灏忎簬绛変簬0鍒犻櫎 锛屽ぇ浜�0淇敼
- if(subtract.compareTo(BigDecimal.ZERO) <= 0){
- ticketRegistrationMapper.deleteById(ticketRegistrations.get(0));
- // 鍒犻櫎浠樻娴佹按璁板綍
- paymentRegistrationMapper.delete(new LambdaQueryWrapper<PaymentRegistration>().eq(PaymentRegistration::getTicketRegistrationId, ticketRegistrations.get(0).getId()));
- }else if(subtract.compareTo(BigDecimal.ZERO) > 0){
- ticketRegistrations.get(0).setInvoiceAmount(subtract);
- ticketRegistrationMapper.updateById(ticketRegistrations.get(0));
- }
- LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductLambdaQueryWrapper = new LambdaQueryWrapper<>();
- salesLedgerProductLambdaQueryWrapper.eq(SalesLedgerProduct::getId, productRecord.getSaleLedgerProjectId())
- .eq(SalesLedgerProduct::getType, 2);
- List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(salesLedgerProductLambdaQueryWrapper);
- if(!CollectionUtils.isEmpty(salesLedgerProducts)){
- for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
- salesLedgerProduct.setFutureTickets(salesLedgerProduct.getFutureTickets().add(productRecord.getTicketsNum()));
- salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getFutureTicketsAmount().add(productRecord.getTicketsAmount()));
- salesLedgerProductMapper.updateById(salesLedgerProduct);
-
- }
- }
- }
- // 鍒犻櫎閲囪喘鍙拌处浜у搧寮�绁ㄨ褰�
- productRecordMapper.delete(productRecordLambdaQueryWrapper);
- return 1;
- }
@Override
public TicketRegistrationDto getRegistrationById(TicketRegistrationDto ticketRegistrationDto) {
@@ -386,7 +375,7 @@
BeanUtils.copyProperties(purchaseLedger, purchaseLedgerDto);
SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
salesLedgerProduct.setSalesLedgerId(id);
- salesLedgerProduct.setType(SalesLedgerType.SALES_LEDGER_TYPE_SALES_LEDGER.getValue());
+ salesLedgerProduct.setType(SalesLedgerType.SALES_LEDGER_TYPE_SALES_LEDGER.getCode());
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
purchaseLedgerDto.setProductData(salesLedgerProducts);
List<CommonFile> commonFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
--
Gitblit v1.9.3