From c5525856b70f4ac7b0c7085a8db4fbd5a09928af Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 09:36:26 +0800
Subject: [PATCH] 导入的发生时间也添加了，ZfEventExcelBean
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java
index c028530..4d2309c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java
@@ -9,6 +9,8 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfEquipment;
+import com.ruoyi.domain.excel.ZfEconomyExcelBean;
+import com.ruoyi.domain.excel.ZfEquipmentExcelBean;
import com.ruoyi.service.ZfEquipmentService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +19,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -40,10 +43,19 @@
@GetMapping("/all")
public AjaxResult listAll(ZfEquipment zfEquipment){
-
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- return zfEquipmentService.selectEquipmentList(zfEquipment, pageNum, pageSize);
+ return zfEquipmentService.selectDataList(zfEquipment, pageNum, pageSize);
+ }
+
+ /**
+ * 鑾峰彇瀵煎叆妯℃澘
+ */
+ @GetMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ZfEquipmentExcelBean> list = Collections.singletonList(new ZfEquipmentExcelBean());
+ ExcelUtil<ZfEquipmentExcelBean> util = new ExcelUtil<>(ZfEquipmentExcelBean.class);
+ util.exportExcel(response,list,"瀹跺涵璁惧璁板綍鏁版嵁");
}
@@ -90,7 +102,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfEquipment zfEquipment)
{
- return toAjax(zfEquipmentService.addEquipment(zfEquipment));
+ return zfEquipmentService.addData2(zfEquipment);
}
/**
--
Gitblit v1.9.1