From ab24e68f152f9031a5ddfe4be7e82a5c84eb7476 Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期三, 09 八月 2023 12:53:16 +0800 Subject: [PATCH] 15648 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java | 37 ++++++++++++++++++++++++++++++++++--- 1 files changed, 34 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java index 4835abe..2334f5b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java @@ -8,7 +8,9 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.domain.ZfDoctor; import com.ruoyi.domain.ZfEconomy; +import com.ruoyi.domain.excel.ZfEconomyExcelBean; import com.ruoyi.service.ZfEconomyService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -17,6 +19,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.Collections; import java.util.List; import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM; @@ -44,6 +47,21 @@ return zfEconomyService.selectDataList(zfEconomy, pageNum, pageSize); } + @GetMapping("/type") + public AjaxResult listType(){ + return zfEconomyService.listType(); + } + + /** + * 鑾峰彇瀵煎叆妯℃澘 + */ + @PostMapping("/model") + public void getExportModel(HttpServletResponse response){ + List<ZfEconomyExcelBean> list = Collections.singletonList(new ZfEconomyExcelBean()); + ExcelUtil<ZfEconomyExcelBean> util = new ExcelUtil<>(ZfEconomyExcelBean.class); + util.exportExcel(response,list,"瀹跺涵鏀舵敮鍙拌处瀵煎叆妯℃澘"); + } + /** * 瀵煎嚭瀹跺涵鏀舵敮鍙拌处璁板綍鍒楄〃 */ @@ -53,6 +71,19 @@ public void export(HttpServletResponse response, ZfEconomy zfEconomy) { List<ZfEconomy> list = zfEconomyService.selectByCondition(zfEconomy); + log.info("瀵煎嚭璁板綍涓�:{}",list); + ExcelUtil<ZfEconomy> util = new ExcelUtil<>(ZfEconomy.class); + util.exportExcel(response, list, "瀹跺涵鏀舵敮鍙拌处璁板綍鏁版嵁"); + } + /** + * 瀵煎嚭瀹跺涵鏀舵敮鍙拌处璁板綍鍒楄〃 + */ +// @PreAuthorize("@ss.hasPermi('system:property:export')") + @Log(title = "瀹跺涵鏀舵敮鍙拌处璁板綍", businessType = BusinessType.EXPORT) + @PostMapping("/export1/{ids}") + public void export(HttpServletResponse response, @PathVariable Long[] ids) + { + List<ZfEconomy> list = zfEconomyService.selectByIds(ids); log.info("瀵煎嚭璁板綍涓�:{}",list); ExcelUtil<ZfEconomy> util = new ExcelUtil<>(ZfEconomy.class); util.exportExcel(response, list, "瀹跺涵鏀舵敮鍙拌处璁板綍鏁版嵁"); @@ -87,7 +118,7 @@ @PostMapping public AjaxResult add(@RequestBody ZfEconomy zfEconomy) { - return zfEconomyService.addData2(zfEconomy); + return zfEconomyService.addData(zfEconomy); } /** @@ -98,7 +129,7 @@ @PutMapping public AjaxResult edit(@RequestBody ZfEconomy zfEconomy) { - return toAjax(zfEconomyService.updateById(zfEconomy)); + return zfEconomyService.updateData(zfEconomy); } // /** @@ -109,7 +140,7 @@ @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(zfEconomyService.removeByIds(Arrays.asList(ids))); + return zfEconomyService.deleteData(ids); } -- Gitblit v1.9.1