zqy
23 小时以前 f610e1425f1e5ff2cb88b17312b24121fd2fa6a5
同一用户 同步婚姻
4个文件已修改
46 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/MarrySelfService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -537,6 +537,8 @@
                if(same){
                    zInfoUserService.setUserInfoSame(infoUser);
                    marrySelfService.setMarryInfoSame(infoUser,marrySelf.getId());
                }
                // 5.5.1 更新配偶关联信息
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/MarrySelfController.java
@@ -75,13 +75,19 @@
                    sysUser.setSex(marryInfoDto.getSpouseSex().equals("男") ? "0" : "1");
                userService.updateUser(sysUser);
            }
            List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(infoBysysId.getUaid());
            for (ZInfoUser zInfoUser1:byUaidToFaid){
                marryInfoDto.setUid(zInfoUser1.getSysId());
                marrySelfService.updateData(marryInfoDto);
            }
        }} catch (Exception e) {
            e.printStackTrace();
            System.out.println("报错"+e.getMessage());
            return AjaxResult.error("更新失败");
        }
        return AjaxResult.success( marrySelfService.updateData(marryInfoDto));
        return AjaxResult.success( );
    }
    //导出
zhang-content/src/main/java/com/ruoyi/service/MarrySelfService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.MarrySelf;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.dto.MarryInfoDto;
/**
@@ -12,6 +13,9 @@
 * @Version 1.0.0
 **/
public interface MarrySelfService extends IService<MarrySelf> {
    void setMarryInfoSame(ZInfoUser zInfoUser, Long id);
    AjaxResult getInfo();
    Boolean updateData(MarryInfoDto marryInfoDto);
zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java
@@ -21,6 +21,7 @@
import javax.annotation.Resource;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -41,6 +42,37 @@
//    @Resource
//    MarrySelfService marrySelfService;
    @Override
    public void setMarryInfoSame(ZInfoUser zInfoUser,Long id){
        List<ZInfoUser> byUaidToFaid = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid());
        List<Long> resultIds = byUaidToFaid.stream()
                .map(ZInfoUser::getSysId)
                .filter(sysId -> !Objects.equals(sysId, zInfoUser.getSysId()))
                .collect(Collectors.toList());
        if (resultIds.size() != 0){
            LambdaQueryWrapper<MarrySelf> marrySelfLQW = new LambdaQueryWrapper<>();
            marrySelfLQW.eq(MarrySelf::getUid,resultIds.get(0));
            MarrySelf myself = getOne(marrySelfLQW);
            MarrySelf newUser = new MarrySelf();
            // 拷贝所有属性
            org.springframework.beans.BeanUtils.copyProperties(myself, newUser);
            newUser.setUid(zInfoUser.getSysId());
            newUser.setId(id);
            System.out.println("ddddd"+newUser);
            this.updateById(newUser);
        }
    }
    @Override