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/ZfDoctorController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java
index fe722be..1c14108 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java
@@ -57,20 +57,32 @@
}
+// /**
+// * 瀵煎嚭瀹跺涵灏忓尰鐢熻褰曞垪琛�
+// */
+//// @PreAuthorize("@ss.hasPermi('system:property:export')")
+// @Log(title = "瀹跺涵灏忓尰鐢熻褰�", businessType = BusinessType.EXPORT)
+// @PostMapping("/export")
+// public void export(HttpServletResponse response, ZfDoctor zfDoctor)
+// {
+// List<ZfDoctor> list = zfDoctorService.selectByCondition(zfDoctor);
+// log.info("瀵煎嚭璁板綍涓�:{}",list);
+// ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class);
+// util.exportExcel(response, list, "瀹跺涵灏忓尰鐢熻褰曟暟鎹�");
+// }
/**
* 瀵煎嚭瀹跺涵灏忓尰鐢熻褰曞垪琛�
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "瀹跺涵灏忓尰鐢熻褰�", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, ZfDoctor zfDoctor)
+ @PostMapping("/export/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids)
{
- List<ZfDoctor> list = zfDoctorService.selectByCondition(zfDoctor);
+ List<ZfDoctor> list = zfDoctorService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}",list);
ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class);
util.exportExcel(response, list, "瀹跺涵灏忓尰鐢熻褰曟暟鎹�");
}
-
/**
* 瀵煎叆瀹跺涵灏忓尰鐢熻褰曞垪琛�
*/
@@ -78,14 +90,16 @@
@PostMapping("/importData")
public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
{
- ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class);
- List<ZfDoctor> eventList = util.importExcel(file.getInputStream());
- log.info("瀹跺涵灏忓尰鐢熷垪琛ㄤ负锛歿}",eventList);
+// ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class);
+// List<ZfDoctor> eventList = util.importExcel(file.getInputStream());
+// log.info("瀹跺涵灏忓尰鐢熷垪琛ㄤ负锛歿}",eventList);
+//
+// if (zfDoctorService.saveBatch(eventList)) {
+// return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
+// }
+// return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
- if (zfDoctorService.saveBatch(eventList)) {
- return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
- }
- return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
+ return zfDoctorService.importExcel(file);
}
/**
@@ -106,7 +120,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfDoctor zfDoctor)
{
- return zfDoctorService.mySave(zfDoctor);
+ return zfDoctorService.addData(zfDoctor);
}
/**
@@ -117,7 +131,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfDoctor zfDoctor)
{
- return toAjax(zfDoctorService.updateById(zfDoctor));
+ return zfDoctorService.updateData(zfDoctor);
}
//
/**
@@ -128,7 +142,7 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(zfDoctorService.removeByIds(Arrays.asList(ids)));
+ return zfDoctorService.deleteData(ids);
}
}
--
Gitblit v1.9.1