From 3f50e9e810b478dbbd3225d9e5cedf47f586b69b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 05 九月 2023 11:25:43 +0800
Subject: [PATCH] 45386
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
index 8177101..1aacbf0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZProperty;
+import com.ruoyi.domain.ZfEconomy;
import com.ruoyi.service.ZPropertyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +49,11 @@
return zPropertyService.selectDataList(zProperty,pageNum,pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zPropertyService.listType();
+ }
+
/**
* 鏍规嵁id鏌ヨ
*/
@@ -59,7 +65,7 @@
/**
* 妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getModel(HttpServletResponse response){
ZProperty zProperty = new ZProperty();
List<ZProperty> emptyList = Collections.singletonList(zProperty);
@@ -72,8 +78,18 @@
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export/{ids}")
- public void export(HttpServletResponse response,@PathVariable Long[] ids)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response)
+ {
+ List<ZProperty> list = zPropertyService.selectByCondition();
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZProperty> util = new ExcelUtil<>(ZProperty.class);
+ util.exportExcel(response, list, "涓汉璐骇璁板綍鏁版嵁");
+ }
+
+ @Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response,@PathVariable Long[] ids)
{
List<ZProperty> list = zPropertyService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}",list);
--
Gitblit v1.9.1