From 86d65e6f837ff14b090ffc3312c013987b6f67d8 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 十月 2025 21:59:13 +0800
Subject: [PATCH] 荣誉 新增两个字段的查询
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
index b8acd25..fda1205 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
@@ -50,11 +50,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfContactExcelBean> list = Collections.singletonList(new ZfContactExcelBean());
ExcelUtil<ZfContactExcelBean> util = new ExcelUtil<>(ZfContactExcelBean.class);
- util.exportExcel(response,list,"閫氳褰曟暟鎹�");
+ util.exportExcel(response,list,"閫氳褰曞鍏ユā鏉�");
}
/**
@@ -72,19 +72,33 @@
}
/**
+ * 瀵煎嚭閫氳褰曡褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "閫氳褰曡褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids)
+ {
+ List<ZfContact> list = zfContactService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
+ util.exportExcel(response, list, "閫氳褰曡褰曟暟鎹�");
+ }
+ /**
* 瀵煎叆閫氳褰曡褰曞垪琛�
*/
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
{
- ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
- List<ZfContact> eventList = util.importExcel(file.getInputStream());
- log.info("閫氳褰曞垪琛ㄤ负锛歿}",eventList);
- if (zfContactService.saveBatch(eventList)) {
- return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
- }
- return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
+// ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
+// List<ZfContact> eventList = util.importExcel(file.getInputStream());
+// log.info("閫氳褰曞垪琛ㄤ负锛歿}",eventList);
+// if (zfContactService.saveBatch(eventList)) {
+// return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
+// }
+// return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
+ return zfContactService.importExcel(file);
}
/**
@@ -105,7 +119,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfContact zfContact)
{
- return (zfContactService.addData2(zfContact));
+ return (zfContactService.addData(zfContact));
}
/**
@@ -116,7 +130,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfContact zfContact)
{
- return toAjax(zfContactService.updateById(zfContact));
+ return zfContactService.updateData(zfContact);
}
//
/**
@@ -127,7 +141,7 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(zfContactService.removeByIds(Arrays.asList(ids)));
+ return zfContactService.deleteData(ids);
}
--
Gitblit v1.9.1