From 8e27235844b5640441d810e18e5adc863479735b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期五, 19 五月 2023 21:41:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java | 17 +++++++++++++++--
1 files changed, 15 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 b8acd25..58d7002 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
@@ -50,11 +50,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @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,"閫氳褰曟暟鎹�");
+ util.exportExcel(response,list,"閫氳褰曞鍏ユā鏉�");
}
/**
@@ -72,6 +72,19 @@
}
/**
+ * 瀵煎嚭閫氳褰曡褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "閫氳褰曡褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids)
+ {
+ List<ZfContact> list = zfContactService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
+ util.exportExcel(response, list, "閫氳褰曡褰曟暟鎹�");
+ }
+ /**
* 瀵煎叆閫氳褰曡褰曞垪琛�
*/
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
--
Gitblit v1.9.1