合并了一个方法

feige

2023-05-17 e5cb65e56ca20f10aa581edfd26e13a114b590f4

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java

@@ -18,6 +18,7 @@

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -64,9 +65,26 @@
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "家庭大事件记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ZfEvent zfEvent) {
        List<ZfEvent> list = zfEventService.selectByCondition(zfEvent);
    @PostMapping("/export/{ids}")
    public void export(HttpServletResponse response, ZfEvent zfEvent,@PathVariable Long[] ids) {
        List<ZfEvent> list = new ArrayList<>();
        if(ids.length!=0)
            list = zfEventService.selectByIds(ids);
        else
            list = zfEventService.selectByCondition(zfEvent);
        log.info("导出记录为:{}", list);
        ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
        util.exportExcel(response, list, "家庭大事件记录数据");

    }
    /**
     * 导出家庭大事件记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "家庭大事件记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
        List<ZfEvent> list = zfEventService.selectByIds(ids);
        log.info("导出记录为:{}", list);
        ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
        util.exportExcel(response, list, "家庭大事件记录数据");