From e5cb65e56ca20f10aa581edfd26e13a114b590f4 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 15:16:44 +0800
Subject: [PATCH] 合并了一个方法
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
index 548a05b..9a1df60 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
@@ -9,6 +9,8 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfContact;
+import com.ruoyi.domain.excel.ZfCollectionExcelBean;
+import com.ruoyi.domain.excel.ZfContactExcelBean;
import com.ruoyi.service.ZfContactService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -17,6 +19,7 @@
import javax.annotation.Resource;
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;
@@ -41,9 +44,18 @@
public AjaxResult listAll(ZfContact zfContact){
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- return zfContactService.selectContactList(zfContact, pageNum, pageSize);
+ return zfContactService.selectDataList(zfContact, pageNum, pageSize);
}
+ /**
+ * 鑾峰彇瀵煎叆妯℃澘
+ */
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ZfContactExcelBean> list = Collections.singletonList(new ZfContactExcelBean());
+ ExcelUtil<ZfContactExcelBean> util = new ExcelUtil<>(ZfContactExcelBean.class);
+ util.exportExcel(response,list,"閫氳褰曞鍏ユā鏉�");
+ }
/**
* 瀵煎嚭閫氳褰曡褰曞垪琛�
@@ -93,7 +105,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfContact zfContact)
{
- return toAjax(zfContactService.save(zfContact));
+ return (zfContactService.addData2(zfContact));
}
/**
--
Gitblit v1.9.1