From 6bd1dc0b355e279b709bc49dda5207121e9b41a9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 15 五月 2025 15:41:26 +0800
Subject: [PATCH] 1.来票台账优化 2.上传优化

---
 src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java |   54 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java b/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
index 256f9c5..8cd6b5b 100644
--- a/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
@@ -1,23 +1,22 @@
 package com.ruoyi.purchase.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.purchase.pojo.InvoicePurchase;
-import com.ruoyi.purchase.service.IInvoicePurchaseService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.purchase.dto.InvoicePurchaseDto;
+import com.ruoyi.purchase.pojo.InvoicePurchase;
+import com.ruoyi.purchase.service.IInvoicePurchaseService;
+import com.ruoyi.sales.service.ICommonFileService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 鍙戠エ淇℃伅Controller
@@ -32,13 +31,15 @@
 
     private IInvoicePurchaseService invoicePurchaseService;
 
+    private ICommonFileService commonFileService;
+
     /**
      * 鏌ヨ鍙戠エ淇℃伅鍒楄〃
      */
     @GetMapping("/list")
-    public TableDataInfo list(InvoicePurchase invoicePurchase) {
+    public TableDataInfo list(InvoicePurchaseDto invoicePurchaseDto) {
         startPage();
-        List<InvoicePurchase> list = invoicePurchaseService.selectInvoicePurchaseList(invoicePurchase);
+        List<InvoicePurchaseDto> list = invoicePurchaseService.selectInvoicePurchaseList(invoicePurchaseDto);
         return getDataTable(list);
     }
 
@@ -48,18 +49,26 @@
     @Log(title = "鍙戠エ淇℃伅", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, InvoicePurchase invoicePurchase) {
-        List<InvoicePurchase> list = invoicePurchaseService.selectInvoicePurchaseList(invoicePurchase);
+        List<InvoicePurchase> list = invoicePurchaseService.selectInvoicePurchaseLists(invoicePurchase);
         ExcelUtil<InvoicePurchase> util = new ExcelUtil<InvoicePurchase>(InvoicePurchase.class);
         util.exportExcel(response, list, "鍙戠エ淇℃伅鏁版嵁");
+    }
+
+    /**
+     * 鏌ヨ鍙戠エ淇℃伅
+     */
+    @GetMapping("/getInvoiceById")
+    public InvoicePurchaseDto getInvoiceById(InvoicePurchaseDto invoicePurchaseDto) {
+        return invoicePurchaseService.getInvoiceById(invoicePurchaseDto);
     }
 
     /**
      * 鏂板淇敼鍙戠エ淇℃伅
      */
     @Log(title = "鍙戠エ淇℃伅", businessType = BusinessType.INSERT)
-    @PostMapping   ("/addOrUpdateInvoice")
-    public AjaxResult addOrUpdateInvoice(@RequestBody InvoicePurchase invoicePurchase) {
-        return toAjax(invoicePurchaseService.addOrUpdateInvoice(invoicePurchase));
+    @PostMapping("/addOrUpdateInvoice")
+    public AjaxResult addOrUpdateInvoice(@RequestBody InvoicePurchaseDto invoicePurchaseDto) throws IOException {
+        return toAjax(invoicePurchaseService.addOrUpdateInvoice(invoicePurchaseDto));
     }
 
     /**
@@ -70,4 +79,13 @@
     public AjaxResult remove(@RequestBody Long[] ids) {
         return toAjax(invoicePurchaseService.delInvoice(ids));
     }
+
+    @PostMapping("/upload")
+    public AjaxResult uploadFile(MultipartFile file, Long id, String type) {
+        try {
+            return AjaxResult.success(commonFileService.uploadFile(file, id, type));
+        } catch (Exception e) {
+            return AjaxResult.error(e.getMessage());
+        }
+    }
 }

--
Gitblit v1.9.3