From aedf7541d3887db0ce8b11c21d44f2860a612886 Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Sat, 23 Nov 2024 17:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8F=90=E4=BA=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contraller/InvoiceController.java         | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/contraller/InvoiceController.java b/src/main/java/org/springblade/modules/business/contraller/InvoiceController.java
index 5aaf9f5..d4090e7 100644
--- a/src/main/java/org/springblade/modules/business/contraller/InvoiceController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/InvoiceController.java
@@ -5,11 +5,13 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.CollectionUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.business.pojo.entity.Invoice;
 import org.springblade.modules.business.service.IInvoiceService;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,12 +36,30 @@ public class InvoiceController extends BladeController {
 	}
 
 	/**
-	 * 资料表 新增
+	 * 资料表 提交
 	 */
-	@GetMapping("/save")
-	public R save(@RequestBody Invoice invoice) {
-		invoice.setUserId(AuthUtil.getUserId());
-		return R.data(invoiceService.save(invoice));
+	@GetMapping("/submit")
+	public R submit(@RequestBody List<Invoice> invoices) {
+		boolean res = false;
+		List<Invoice> add = new ArrayList<>();
+		List<Invoice> edit = new ArrayList<>();
+		for (Invoice invoice : invoices) {
+			if (invoice.getId() != null) {
+				edit.add(invoice);
+			} else {
+				invoice.setUserId(AuthUtil.getUserId());
+				add.add(invoice);
+			}
+		}
+		// 修改
+		if (CollectionUtil.isNotEmpty(edit)) {
+			res = invoiceService.updateBatchById(edit);
+		}
+		// 新增
+		if (CollectionUtil.isNotEmpty(add)) {
+			res = invoiceService.updateBatchById(add);
+		}
+		return R.data(res);
 	}
 
 	/**