From 1212e2b0dea3b44668c5293a3267a6fb780b420f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 28 六月 2025 14:28:08 +0800
Subject: [PATCH] 2025-06-28 bug修改

---
 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 9ec44e8..99dd081 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -133,8 +133,10 @@
         BeanUtils.copyProperties(ticketRegistrationDto, ticketRegistration);
         ticketRegistration.setPurchaseContractNumber(purchaseLedger.getPurchaseContractNumber());
         ticketRegistration.setTenantId(purchaseLedger.getTenantId());
+        ticketRegistration.setIssueDate(ticketRegistrationDto.getIssueDate());
         ticketRegistration.setContractAmount(purchaseLedger.getContractAmount());
         ticketRegistration.setSalesLedgerId(purchaseLedger.getSalesLedgerId());
+        ticketRegistration.setEnterDate(ticketRegistrationDto.getEnterDate());
 
         // 4. 澶勭悊瀛愯〃鏁版嵁
         List<SalesLedgerProduct> productData = ticketRegistrationDto.getProductData();
@@ -200,9 +202,10 @@
             // 鏋勫缓姝e紡鏂囦欢鍚嶏紙鍖呭惈涓氬姟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);
@@ -223,7 +226,7 @@
                 fileRecord.setName(originalFilename);
                 fileRecord.setUrl(formalFilePath.toString());
                 fileRecord.setCreateTime(LocalDateTime.now());
-                fileRecord.setType(tempFile.getType());
+                fileRecord.setType(4);
                 commonFileMapper.insert(fileRecord);
 
                 log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);

--
Gitblit v1.9.3