祖先修改&家谱生日搜索

zqy

2024-11-26 8a3d7199725a52b555d46daae5e95cef914c9ab3

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

@@ -176,12 +176,47 @@
     */
    @Log(title = "祖先", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ZfAncestor zfAncestor) {
    public AjaxResult edit(@RequestBody AncestorHelper ancestorHelper) {

        ZfAncestor spouseSex = zfAncestorService.update(zfAncestor);
        updateAncestor(zfAncestor);
        if (spouseSex.getId() != null)
        updateAncestor(spouseSex);
//        ZfAncestor spouseSex = zfAncestorService.update(zfAncestor);
//        updateAncestor(zfAncestor);
//        if (spouseSex.getId() != null)
//        updateAncestor(spouseSex);

        //修改sys_user表
        SysUser us = new SysUser();
        us.setNickName(ancestorHelper.getName());
        //   us.setStatus(String.valueOf(zfAncestor.getStatus()));
        us.setSex(String.valueOf(ancestorHelper.getSex()));
        us.setUserName(ancestorHelper.getName());
//        us.setClanId(ancestorHelper.getClanId());
        us.setUserId(ancestorHelper.getSysId());

        if (!userService.checkNickNameUnique(us)) {
            return error("修改祖先'" + us.getNickName() + "'失败，登录账号已存在");
        }
        userService.updateUser(us);


        //修改z_info_user表
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setSysId(us.getUserId());
        infoUser.setNickName(us.getNickName());
        infoUser.setOldName(us.getUserName());
        infoUser.setSex(Integer.parseInt(us.getSex()));
        ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(us.getUserId());
        infoUser.setUserId(infoBysysId.getUserId());

        zInfoUserService.saveOrUpdate(infoUser);

        //修改zf_ancestor表
        ZfAncestor zfAncestor = new ZfAncestor();
//        zfAncestor.setClanId(ancestorHelper.getClanId());
        zfAncestor.setName(ancestorHelper.getName());
        zfAncestor.setSex(ancestorHelper.getSex());
        zfAncestor.setSysId(ancestorHelper.getSysId());

        zfAncestorService.update(zfAncestor);

        return  AjaxResult.success();
    }
@@ -307,10 +342,6 @@
            zfAncestor1.setStatus(0);
            zfAncestor1.setSysId(usa.getUserId());
            zfAncestorService.addData(zfAncestor1);




        }
        else{
            //保存祖先管理员,也先保存到sys_user
@@ -351,7 +382,6 @@
            zfAncestor.setSysId(us.getUserId());

            zfAncestorService.addData(zfAncestor);


        }