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/dto/ProductRecordDto.java                       |    3 +++
 src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java |    2 +-
 src/main/resources/mapper/purchase/ProductRecordMapper.xml                       |    3 +++
 src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java    |    8 ++++++++
 src/main/java/com/ruoyi/other/controller/TempFileController.java                 |   19 +++++++++++++++++++
 5 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/other/controller/TempFileController.java b/src/main/java/com/ruoyi/other/controller/TempFileController.java
index 1ed7875..810c532 100644
--- a/src/main/java/com/ruoyi/other/controller/TempFileController.java
+++ b/src/main/java/com/ruoyi/other/controller/TempFileController.java
@@ -3,8 +3,13 @@
 
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.other.service.TempFileService;
+import com.ruoyi.purchase.dto.ProductRecordDto;
+import com.ruoyi.purchase.dto.TicketRegistrationDto;
+import com.ruoyi.purchase.service.ITicketRegistrationService;
+import com.ruoyi.purchase.service.impl.TicketRegistrationServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
@@ -17,6 +22,8 @@
 
     private TempFileService tempFileService;
 
+    private TicketRegistrationServiceImpl ticketRegistrationServiceImpl;
+
     @PostMapping("/upload")
     public AjaxResult uploadFile(MultipartFile file, Integer type) {
         try {
@@ -26,4 +33,16 @@
         }
     }
 
+    @PostMapping("uploadFile")
+    public AjaxResult uploadFile(@RequestBody ProductRecordDto productRecordDto) {
+        try {
+            if (!productRecordDto.getTempFileIds().isEmpty()&&productRecordDto.getTicketRegistrationId() != null) {
+                ticketRegistrationServiceImpl.migrateTempFilesToFormal(productRecordDto.getTicketRegistrationId(), productRecordDto.getTempFileIds());
+            }
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+        return AjaxResult.success();
+    }
+
 }
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index 7b8ceed..40ec673 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -19,6 +19,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -82,6 +83,13 @@
         return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
     }
 
+    @ApiModelProperty("淇敼鏉ョエ鐧昏")
+    @PostMapping("/updateRegistration")
+    public AjaxResult updateRegistration(@RequestBody TicketRegistrationDto ticketRegistrationDto) {
+
+        return AjaxResult.success();
+    }
+
     /**
      * 鍒犻櫎鏉ョエ鐧昏
      */
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
index 92c4b86..261159a 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
@@ -1,5 +1,6 @@
 package com.ruoyi.purchase.dto;
 
+import com.ruoyi.other.pojo.TempFile;
 import com.ruoyi.purchase.pojo.ProductRecord;
 import com.ruoyi.sales.pojo.CommonFile;
 import lombok.Data;
@@ -30,4 +31,6 @@
     private String unTicketsPrice = "0";
 
     private List<CommonFile> commonFiles;
+
+    private List<String> tempFileIds;
 }
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 966e361..25de5ed 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -178,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;
         }
diff --git a/src/main/resources/mapper/purchase/ProductRecordMapper.xml b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
index 35f08ac..980727c 100644
--- a/src/main/resources/mapper/purchase/ProductRecordMapper.xml
+++ b/src/main/resources/mapper/purchase/ProductRecordMapper.xml
@@ -35,5 +35,8 @@
         <if test="c.createdAtEnd != null and c.createdAtEnd != ''">
             and pr.created_at &lt;= date_format(#{c.createdAtEnd},'%Y-%m-%d hh:mm:ss')
         </if>
+        <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
+            and tr.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+        </if>
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3