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/ZfEquipmentController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 4d2309c..b871ac0 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,7 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfEquipment;
+import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.excel.ZfEconomyExcelBean;
import com.ruoyi.domain.excel.ZfEquipmentExcelBean;
import com.ruoyi.service.ZfEquipmentService;
@@ -51,11 +52,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfEquipmentExcelBean> list = Collections.singletonList(new ZfEquipmentExcelBean());
ExcelUtil<ZfEquipmentExcelBean> util = new ExcelUtil<>(ZfEquipmentExcelBean.class);
- util.exportExcel(response,list,"瀹跺涵璁惧璁板綍鏁版嵁");
+ util.exportExcel(response,list,"瀹跺涵璁惧瀵煎叆妯℃澘");
}
@@ -72,6 +73,19 @@
ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class);
util.exportExcel(response, list, "瀹跺涵璁惧璁板綍鏁版嵁");
}
+ /**
+ * 瀵煎嚭瀹跺涵璁惧璁板綍鍒楄〃
+ */
+ @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
+ List<ZfEquipment> list = zfEquipmentService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}", list);
+ ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class);
+ util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+
+ }
+
//
/**
--
Gitblit v1.9.1