From 1f5b65a28808b0635e1816ca7b4270c94fa7fda9 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 05 八月 2023 10:14:19 +0800
Subject: [PATCH] 51561
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 bb1eb28..9582c55 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,17 +42,17 @@
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);
}
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfPropertyExcelBean> list = Collections.singletonList(new ZfPropertyExcelBean());
ExcelUtil<ZfPropertyExcelBean> util = new ExcelUtil<>(ZfPropertyExcelBean.class);
- util.exportExcel(response,list,"瀹跺涵璧勪骇璁板綍鏁版嵁");
+ util.exportExcel(response,list,"瀹跺涵璧勪骇瀵煎叆妯℃澘");
}
/**
@@ -65,6 +66,17 @@
List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
log.info("瀵煎嚭璁板綍涓�:{}",list);
ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
+ util.exportExcel(response, list, "瀹跺涵璧勪骇璁板綍鏁版嵁");
+ }
+ /**
+ * 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
+ */
+ @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{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