From d2a1957ec40c70c696ab3260d7f7df90c4539589 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期五, 21 七月 2023 15:33:31 +0800
Subject: [PATCH] 1254
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
index 1d82913..4dceeef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.domain.excel.ZfEconomyExcelBean;
import com.ruoyi.domain.excel.ZfPropertyExcelBean;
@@ -41,7 +42,7 @@
public AjaxResult listAll(ZfProperty zfProperty){
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
- return zfPropertyService.selectPropertyList(zfProperty, pageNum, pageSize);
+ return zfPropertyService.selectDataList(zfProperty, pageNum, pageSize);
}
/**
@@ -54,17 +55,28 @@
util.exportExcel(response,list,"瀹跺涵璧勪骇瀵煎叆妯℃澘");
}
+// /**
+// * 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
+// */
+//// @PreAuthorize("@ss.hasPermi('system:property:export')")
+// @Log(title = "瀹跺涵璧勪骇璁板綍", businessType = BusinessType.EXPORT)
+// @PostMapping("/export")
+// public void export(HttpServletResponse response,ZfProperty zfProperty)
+// {
+// List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
+// log.info("瀵煎嚭璁板綍涓�:{}",list);
+// ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
+// util.exportExcel(response, list, "瀹跺涵璧勪骇璁板綍鏁版嵁");
+// }
/**
* 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('system:property:export')")
- @Log(title = "瀹跺涵璧勪骇璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response,ZfProperty zfProperty)
- {
- List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
- log.info("瀵煎嚭璁板綍涓�:{}",list);
- ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
+ @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export/{ids}")
+ public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
+ List<ZfProperty> list = zfPropertyService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}", list);
+ ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
util.exportExcel(response, list, "瀹跺涵璧勪骇璁板綍鏁版嵁");
}
//
@@ -97,7 +109,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfProperty zfProperty)
{
- return zfPropertyService.addData2(zfProperty);
+ return zfPropertyService.addData(zfProperty);
}
/**
@@ -108,7 +120,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfProperty zfProperty)
{
- return toAjax(zfPropertyService.updateById(zfProperty));
+ return zfPropertyService.updateData(zfProperty);
}
//
/**
@@ -119,6 +131,6 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(zfPropertyService.removeByIds(Arrays.asList(ids)));
+ return zfPropertyService.deleteData(ids);
}
}
--
Gitblit v1.9.1