feige
2023-05-17 7c22bbe310cc5086bf246ed6bf72e74654028619
修改了导出接口,可以根据选择的ids进行导出
3个文件已修改
17 ■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/ZfEventService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
@@ -65,8 +65,8 @@
//    @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);
    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, "家庭大事件记录数据");
zhang-content/src/main/java/com/ruoyi/service/ZfEventService.java
@@ -21,6 +21,7 @@
    AjaxResult selectDataList(ZfEvent zfEvent, Integer pageNum, Integer pageSize);
    List<ZfEvent> selectByCondition(ZfEvent zfEvent);
    List<ZfEvent> selectByIds(Long[] ids);
    AjaxResult addData(ZfEvent zfEvent);
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -24,6 +24,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -201,6 +203,16 @@
        return markOwnData(familyIds, beanRecords);
    }
    @Override
    public List<ZfEvent> selectByIds(Long[] ids) {
        List<ZfEvent> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }
    private static List<ZfEvent> markOwnData(String familyIds, List<ZfEvent> beanRecords) {
        return beanRecords.stream().peek(record -> {
            String recordFamilyId = record.getFamilyId();