修改家谱bug

zengqinyu

2025-04-22 c119927474106ead6513f830b02bceea98dc9cde

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

@@ -1,9 +1,15 @@
package com.ruoyi.web.controller.zhang;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZCertificate;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfFamily;
import com.ruoyi.domain.dto.UserInfoDto;
@@ -14,6 +20,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;

import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;

/**
 * @Author Jinquan_Ou
@@ -29,8 +38,10 @@
    ZfFamilyService zfFamilyService;

    @GetMapping("/all")
    public AjaxResult getAllFamily(){
        return AjaxResult.success(zfFamilyService.list());
    public AjaxResult getAllFamily(ZfFamily zfFamily){
        Integer pageNo = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
        return zfFamilyService.selectDataList(zfFamily, pageNo,pageSize);
    }

    /**
@@ -44,9 +55,9 @@
    public AjaxResult getByFId(@PathVariable("fid") Long fid){
        return AjaxResult.success(zfFamilyService.getByFid(fid));
    }
    @GetMapping("/findByFname/{name}")
    public AjaxResult getByFName(@PathVariable("name") String name){
        return AjaxResult.success(zfFamilyService.getByName(name));
    @GetMapping("/findByFname/{name}/{clanId}")
    public AjaxResult getByFName(@PathVariable("name") String name, @PathVariable("clanId") Integer clanId){
        return AjaxResult.success(zfFamilyService.getByName(name, clanId));
    }


@@ -76,10 +87,17 @@
    @Log(title = "家庭大事件记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response) {
        List<ZfFamily> list = zfFamilyService.list();
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        Integer clanId = user.getClanId();
        LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>();
        lqw.eq(ZfFamily::getClanId,clanId);
        List<ZfFamily> list = zfFamilyService.list(lqw);
                //.list();

        System.out.println("------------------");
        ExcelUtil<ZfFamily> util = new ExcelUtil<>(ZfFamily.class);
        util.exportExcel(response, list, "家庭大事件记录数据");
        util.exportExcel(response, list, "家庭号数据");

    }