From 6fa5ee32d0e3c222dbf1308f2d4071717c528940 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 07 七月 2025 14:57:01 +0800
Subject: [PATCH] 2025-07-03 来票台账附件可补传
---
src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 ddde6d5..25de5ed 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -152,10 +152,12 @@
if (CollectionUtils.isNotEmpty(salesLedgerProducts)) {
for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
ProductRecord productRecord = new ProductRecord();
+
productRecord.setTicketRegistrationId(ticketRegistration.getId());
productRecord.setPurchaseLedgerId(ticketRegistrationDto.getPurchaseLedgerId());
productRecord.setCreatedAt(DateUtils.getNowDate());
BeanUtils.copyProperties(salesLedgerProduct, productRecord);
+ productRecord.setSaleLedgerProjectId(salesLedgerProduct.getId());
productRecord.setId(null);
productRecord.setType("2");
productRecordMapper.insert(productRecord);
@@ -176,7 +178,7 @@
* @param tempFileIds 涓存椂鏂囦欢ID鍒楄〃
* @throws IOException 鏂囦欢鎿嶄綔寮傚父
*/
- private void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException {
+ public void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException {
if (CollectionUtils.isEmpty(tempFileIds)) {
return;
}
@@ -202,9 +204,10 @@
// 鏋勫缓姝ｅ紡鏂囦欢鍚嶏紙鍖呭惈涓氬姟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) +
+ UUID.randomUUID().toString().substring(0, 8) +baseName+
(com.ruoyi.common.utils.StringUtils.hasText(fileExtension) ? "." + fileExtension : "");
Path formalFilePath = formalDirPath.resolve(formalFilename);
--
Gitblit v1.9.3