From 1c741aeeb78327e9ce93e6c2248e3aa779cdb030 Mon Sep 17 00:00:00 2001 From: Jinquan_Ou <Jinquan@gdut.com> Date: 星期四, 06 四月 2023 22:16:30 +0800 Subject: [PATCH] 888 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 13 ++----------- 1 files changed, 2 insertions(+), 11 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 6cd7dad..f8aab63 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 @@ -69,16 +69,7 @@ @PostMapping("/importData") public AjaxResult importData(@RequestParam("excelImport")MultipartFile file) throws Exception { - ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class); - List<ZfProperty> propertyList = util.importExcel(file.getInputStream()); - log.info("璧勪骇鍒楄〃涓猴細{}",propertyList); - - if (zfPropertyService.saveBatch(propertyList)) { - return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛"); - } - - return AjaxResult.error("瀵煎叆鏁版嵁澶辫触"); - + return zfPropertyService.importExcel(file); } /** @@ -99,7 +90,7 @@ @PostMapping public AjaxResult add(@RequestBody ZfProperty zfProperty) { - return toAjax(zfPropertyService.save(zfProperty)); + return toAjax(zfPropertyService.addProperty(zfProperty)); } /** -- Gitblit v1.9.1