From b4895bdc5d9268e55c0023b92cc7c2d68ba33e46 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 05 十一月 2024 10:07:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java
index 2d2fe22..acf1d5f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZYearInfoController.java
@@ -48,6 +48,11 @@
return zYearInfoService.selectDataList(zYearInfo,pageNum,pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zYearInfoService.listType();
+ }
+
/**
* 鏍规嵁id鏌ヨ
*/
@@ -59,7 +64,7 @@
/**
* 妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getModel(HttpServletResponse response){
ZYearInfo zYearInfo = new ZYearInfo();
List<ZYearInfo> emptyList = Collections.singletonList(zYearInfo);
@@ -81,6 +86,16 @@
util.exportExcel(response, list, "骞村害鍋ュ悍璁板綍鏁版嵁");
}
+ @Log(title = "骞村害鍋ュ悍璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export1(HttpServletResponse response)
+ {
+ List<ZYearInfo> list = zYearInfoService.selectByCondition();
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZYearInfo> util = new ExcelUtil<>(ZYearInfo.class);
+ util.exportExcel(response, list, "骞村害鍋ュ悍璁板綍鏁版嵁");
+ }
+
/**
* 瀵煎叆骞村害鍋ュ悍璁板綍鍒楄〃
*/
--
Gitblit v1.9.1