修改过滤配偶

zqy

2024-06-28 b2fd87f84dda13225dde9c3ab1ff56d560a80b44

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

@@ -20,6 +20,7 @@
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.service.ZfRoleService;
import com.ruoyi.system.mapper.SysUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -27,6 +28,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.websocket.server.PathParam;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -56,6 +58,9 @@

    @Resource
    private ZfRoleService zfRoleService;

    @Resource
    private SysUserMapper sysUserMapper;

//    @GetMapping("/all")
//    public AjaxResult  listAll(ZInfoUser zInfoUser){
@@ -114,6 +119,12 @@
    public AjaxResult getInfo() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        return AjaxResult.success(zInfoUserService.getInfoById(userId));
    }
    @GetMapping("/{id}")
    public AjaxResult getInfoById(@PathVariable("id") Long id) {
      //  SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = id;
        return AjaxResult.success(zInfoUserService.getInfoById(userId));
    }
//
@@ -192,7 +203,58 @@
//
//        return zInfoUserService.empower(empowerDto);
//    }
    /**
     * 根据用户id判断是否是子孙 tpfid:自己id 根据用户id判断是否是异性  不是本家的人选
     */
    @GetMapping("/uidAndUJd/{tpfid}/{sex}")
        public AjaxResult findByUidAndUid(@PathVariable("tpfid")  Long tpfid, @PathVariable("sex")  Integer sex)
        {
//            Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
            //sex == 0 -> 男
            if (sex == 1){
                sex = 0;
            }
            else if (sex == 0){
                sex = 1;
            }
            List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
            List<Long> satisfyIds = new ArrayList<>();
            for (ZInfoUser zInfoUser:zInfoUsers) {
                if (zInfoUser.getIsMyFamily() == 1)
                    if (!zInfoUserService.findByuid(zInfoUser.getUserId(), tpfid)){
                        satisfyIds.add(zInfoUser.getUserId());
                    }
            }
            return AjaxResult.success(satisfyIds);
        }
    /**
     * 根据用户id判断是否是异性
     */

//    /**
//     * 根据用户id判断是否是子孙(uid:?,tpfid:自己id) 根据用户id判断是否是异性     不是本家的人选
//     */
//    @GetMapping("/uidAndUJd/{uid}/{tpfid}/{sex}")
//        public AjaxResult findByUidAndUid(@PathVariable("uid")  Long uid,@PathVariable("tpfid")  Long tpfid, @PathVariable("sex")  Integer sex)
//        {
////            Integer sex = zInfoUserService.getInfoById(tpfid).getSex();
//            //sex == 0 -> 男
//            if (sex == 1){
//                sex = 0;
//            }
//            else if (sex == 0){
//                sex = 1;
//            }
//            List<ZInfoUser> zInfoUsers = zInfoUserService.getDataBySex(sex);
//            List<String> nickName = new ArrayList<>();
//            for (ZInfoUser zInfoUser:zInfoUsers) {
//                if (!zInfoUserService.findByuid(uid, tpfid)){
//                    if (zInfoUser.getIsMyFamily() == 1)
//                        nickName.add(zInfoUser.getNickName());
//                }
//            }
//            return AjaxResult.success(nickName);
//        }
    /**
     * 家根网
     */
@@ -200,7 +262,14 @@
    public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
        return zInfoUserService.listWithTree(depth);
    }

    /**
     * 根据家庭成员找到所有人
     */
    @GetMapping("/allFamInfo")
        public AjaxResult listAllFamilyPeople()
        {
            return zInfoUserService.listAllFamilyPeople();
        }

    /**
     * 找到所有的成员
@@ -257,6 +326,11 @@
        return zInfoUserService.listGenealogy2(genealogy,pageNum,pageSize);
    }

    @GetMapping("/list/getInfoByfid/{fid}")
    public AjaxResult getInfoByfid(@PathVariable("fid") Long fid)
    {
        return zInfoUserService.getInfoByfid(fid);
    }


}