From 6aca42d916c27bc2f06f6e44832661b7210444d0 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 28 一月 2026 13:46:37 +0800
Subject: [PATCH] yys 来票登记修改
---
src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java | 2 +-
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 4 ++--
src/main/java/com/ruoyi/other/service/TempFileService.java | 2 ++
src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java | 12 +++++++++++-
src/main/java/com/ruoyi/other/controller/TempFileController.java | 9 +++++++++
5 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/other/controller/TempFileController.java b/src/main/java/com/ruoyi/other/controller/TempFileController.java
index 810c532..1175eb0 100644
--- a/src/main/java/com/ruoyi/other/controller/TempFileController.java
+++ b/src/main/java/com/ruoyi/other/controller/TempFileController.java
@@ -33,6 +33,15 @@
}
}
+ @PostMapping("/uploadByCommon")
+ public AjaxResult uploadByCommon(MultipartFile file, Integer type, Long id) {
+ try {
+ return AjaxResult.success(tempFileService.uploadByCommon(file, type,id));
+ } catch (Exception e) {
+ return AjaxResult.error(e.getMessage());
+ }
+ }
+
@PostMapping("uploadFile")
public AjaxResult uploadFile(@RequestBody ProductRecordDto productRecordDto) {
try {
diff --git a/src/main/java/com/ruoyi/other/service/TempFileService.java b/src/main/java/com/ruoyi/other/service/TempFileService.java
index 049f977..355e43c 100644
--- a/src/main/java/com/ruoyi/other/service/TempFileService.java
+++ b/src/main/java/com/ruoyi/other/service/TempFileService.java
@@ -7,4 +7,6 @@
public interface TempFileService {
TempFile uploadFile(MultipartFile file,Integer type) throws IOException;
+
+ String uploadByCommon(MultipartFile file, Integer type, Long id) throws IOException;
}
diff --git a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
index 6f39755..b8e0e2a 100644
--- a/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/other/service/impl/TempFileServiceImpl.java
@@ -26,6 +26,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.Collections;
import java.util.List;
import java.util.UUID;
@@ -76,10 +77,19 @@
tempFileRecord.setExpireTime(LocalDateTime.now().plusHours(2)); // 2灏忔椂鍚庤繃鏈�
tempFileRecord.setType(type);
tempFileMapper.insert(tempFileRecord);
-
return tempFileRecord;
}
+ @Override
+ public String uploadByCommon(MultipartFile file, Integer type, Long id) throws IOException{
+ TempFile tempFile = uploadFile(file, type);
+ if (tempFile != null) {
+ migrateTempFilesToFormal(id, Collections.singletonList(tempFile.getTempId()), type);
+ return tempFile.getTempPath();
+ }
+ return null;
+ }
+
/**
* 灏嗕复鏃舵枃浠惰縼绉诲埌姝ｅ紡鐩綍
*
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
index d5c67b9..dddfd10 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
@@ -66,7 +66,7 @@
page.setSize(productRecordDtoIPage1.getTotal());
IPage<ProductRecordDto> productRecordDtoIPage = productRecordMapper.productRecordPage(page, ticketRegistrationDto);
productRecordDtoIPage.getRecords().forEach(productRecordDto -> {
- productRecordDto.setCommonFiles(commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>().eq(CommonFile::getCommonId, productRecordDto.getTicketRegistrationId())
+ productRecordDto.setCommonFiles(commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>().eq(CommonFile::getCommonId, productRecordDto.getId())
.eq(CommonFile::getType, FileNameType.PURCHASELEDGER.getValue())));
});
return productRecordDtoIPage;
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index efeda16..0ed5eb4 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -18,8 +18,8 @@
pl.supplier_name,
pl.project_name,
pl.contract_amount,
- sum(tr.invoice_amount)as receipt_payment_amount,
- pl.contract_amount-sum(tr.invoice_amount) AS unReceipt_payment_amount,
+ IFNULL(sum(tr.invoice_amount),0) as receipt_payment_amount,
+ pl.contract_amount-IFNULL(sum(tr.invoice_amount),0) AS unReceipt_payment_amount,
pl.entry_date,
pl.execution_date,
pl.recorder_id,
--
Gitblit v1.9.3