zqy
2025-04-22 c4ec501d4280f34c1abcf18015b1b9605626677a
家族导出bug
3个文件已修改
32 ■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfClanController.java
@@ -10,10 +10,7 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.Meeting;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfClan;
import com.ruoyi.domain.ZfClean;
import com.ruoyi.domain.*;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfClanService;
import com.ruoyi.system.mapper.SysUserRoleMapper;
@@ -106,12 +103,22 @@
     */
    @Log(title = "家族记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, @RequestBody ZfClan zfClean)
    public void export(HttpServletResponse response, ZfClan zfClean)
    {
        List<ZfClan> list = zfClanService.selectByCondition(zfClean);
   //     log.info("导出记录为:{}",list);
        ExcelUtil<ZfClan> util = new ExcelUtil<>(ZfClan.class);
        util.exportExcel(response, list, "家族号");
    }
    /**
     * 导出家庭资产记录列表
     */
    @Log(title = "家庭大事件记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
        for (Long id :ids) System.out.println("//////"+id);
        List<ZfClan> list = zfClanService.selectByIds(ids);
        ExcelUtil<ZfClan> util = new ExcelUtil<ZfClan>(ZfClan.class);
        util.exportExcel(response, list, "家庭资产记录数据");
    }
}
zhang-content/src/main/java/com/ruoyi/service/ZfClanService.java
@@ -6,6 +6,7 @@
import com.ruoyi.domain.Meeting;
import com.ruoyi.domain.ZfClan;
import com.ruoyi.domain.ZfClean;
import com.ruoyi.domain.ZfProperty;
import java.util.List;
@@ -23,4 +24,6 @@
    List<ZfClan> selectByCondition(ZfClan zfClan);
    List<ZfClan> selectByIds(Long[] ids);
}
zhang-content/src/main/java/com/ruoyi/service/impl/ZfClanServiceImpl.java
@@ -114,6 +114,16 @@
    }
    @Override
    public List<ZfClan> selectByIds(Long[] ids) {
        List<ZfClan> list = new ArrayList<>();
        if(ids.length!=0)
            list = listByIds(Arrays.asList(ids));
        else
            list = list();
        return list;
    }
    @Override
    public AjaxResult addData(ZfClan zfClan) {
        LambdaQueryWrapper<ZfClan> lqw = uniqueCondition(zfClan);
        List<ZfClan> list = list(lqw);