From 3cfa0bda6574d0c39db120c457e98a168aa193e8 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期日, 23 四月 2023 17:15:20 +0800
Subject: [PATCH] 完成婚姻
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
index 485e78d..82753e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
@@ -42,7 +42,7 @@
public AjaxResult listAll(ZfEvent zfEvent){
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- return zfEventService.selectEventList(zfEvent, pageNum, pageSize);
+ return zfEventService.selectDataList(zfEvent, pageNum, pageSize);
}
@@ -67,14 +67,7 @@
@PostMapping("/importData")
public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
{
- ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
- List<ZfEvent> eventList = util.importExcel(file.getInputStream());
- log.info("瀹跺涵澶т簨浠跺垪琛ㄤ负锛歿}",eventList);
-
- if (zfEventService.saveBatch(eventList)) {
- return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
- }
- return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
+ return zfEventService.importExcel(file);
}
@@ -96,7 +89,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfEvent zfEvent)
{
- return toAjax(zfEventService.save(zfEvent));
+ return zfEventService.addData2(zfEvent);
}
/**
--
Gitblit v1.9.1