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 invoices) { + boolean res = false; + List add = new ArrayList<>(); + List 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); } /**