1254

whywhyo

2023-07-21 d2a1957ec40c70c696ab3260d7f7df90c4539589

 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;
@@ -59,14 +60,29 @@
    }


//    /**
//     * 导出家庭大事件记录列表
//     */
////    @PreAuthorize("@ss.hasPermi('system:property:export')")
//    @Log(title = "家庭大事件记录", businessType = BusinessType.EXPORT)
//    @PostMapping("/export")
//    public void export(HttpServletResponse response, ZfEvent zfEvent) {
//        List<ZfEvent> list = new ArrayList<>();
//
//        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("/export")
    public void export(HttpServletResponse response, ZfEvent zfEvent) {
        List<ZfEvent> list = zfEventService.selectByCondition(zfEvent);
    @PostMapping("/export/{ids}")
    public void export(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, "家庭大事件记录数据");
@@ -80,9 +96,7 @@
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
    @PostMapping("/importData")
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception {

        return zfEventService.importExcel(file);

    }

    /**
@@ -102,7 +116,7 @@
    @Log(title = "家庭大事件记录", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ZfEvent zfEvent) {
        return zfEventService.addData2(zfEvent);
        return zfEventService.addData(zfEvent);
    }

    /**
@@ -112,7 +126,7 @@
    @Log(title = "家庭大事件记录", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ZfEvent zfEvent) {
        return toAjax(zfEventService.updateById(zfEvent));
        return zfEventService.updateData(zfEvent);
    }
//

@@ -123,7 +137,7 @@
    @Log(title = "家庭大事件记录", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(zfEventService.removeByIds(Arrays.asList(ids)));
        return zfEventService.deleteData(ids);
    }

}