From fc4b360e4ce47c29cc96f941d37d22a225a139b1 Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期六, 29 七月 2023 10:37:32 +0800 Subject: [PATCH] 56187 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 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 9a197dd..bfadebf 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 @@ -76,7 +76,7 @@ // @PreAuthorize("@ss.hasPermi('system:property:export')") @Log(title = "瀹跺涵灏忓尰鐢熻褰�", businessType = BusinessType.EXPORT) @PostMapping("/export1/{ids}") - public void export1(HttpServletResponse response, @PathVariable Long[] ids) + public void export(HttpServletResponse response, @PathVariable Long[] ids) { List<ZfDoctor> list = zfDoctorService.selectByIds(ids); log.info("瀵煎嚭璁板綍涓�:{}",list); @@ -90,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); } /** @@ -118,7 +120,7 @@ @PostMapping public AjaxResult add(@RequestBody ZfDoctor zfDoctor) { - return zfDoctorService.mySave(zfDoctor); + return zfDoctorService.addData(zfDoctor); } /** @@ -129,7 +131,7 @@ @PutMapping public AjaxResult edit(@RequestBody ZfDoctor zfDoctor) { - return toAjax(zfDoctorService.updateById(zfDoctor)); + return zfDoctorService.updateData(zfDoctor); } // /** @@ -140,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