whywhyo
2023-07-22 dfdd4bd5d112a17ccd1483ad11fe023817d54d26
zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java
@@ -84,15 +84,56 @@
            oldSpouseList.add(oldSpouse);
        }
        //统一封装返回
        HashMap<String, Object> resultMap = new HashMap<>();
        resultMap.put("myInfo",myself);
        resultMap.put("spouseInfo",spouse);
        resultMap.put("marryInfo",myMarryInfo);
        resultMap.put("oldSpouseInfo",oldSpouseList);
//        //统一封装返回
//        HashMap<String, Object> resultMap = new HashMap<>();
//        resultMap.put("myInfo",myself);
//        resultMap.put("spouseInfo",spouse);
//        resultMap.put("marryInfo",myMarryInfo);
//        resultMap.put("oldSpouseInfo",oldSpouseList);
        return AjaxResult.success(resultMap);
        //转成DTO返回
        MarryInfoDto marryInfoDto = MarryInfoToDto(myMarryInfo, oldSpouseList, myself, spouse);
        return AjaxResult.success(marryInfoDto);
    }
    private MarryInfoDto MarryInfoToDto(ZMarry myMarryInfo,List<MarryUser> oldSpouseList,MarryUser myself,MarryUser spouse){
        MarryInfoDto marryInfoDto = new MarryInfoDto();
        marryInfoDto.setId(myself.getId());
        marryInfoDto.setName(myself.getName());
        marryInfoDto.setBirthday(myself.getBirthday());
        marryInfoDto.setAddress(myself.getAddress());
        marryInfoDto.setIdNo(myself.getIdNo());
        marryInfoDto.setMarryStatus(myself.getMarryStatus());
        marryInfoDto.setSex(myself.getSex());
        marryInfoDto.setNation(myself.getNation());
        marryInfoDto.setPhone(myself.getPhone());
        marryInfoDto.setSpouseId(spouse.getId());
        marryInfoDto.setSpouseName(spouse.getName());
        marryInfoDto.setSpouseBirthday(spouse.getBirthday());
        marryInfoDto.setSpouseAddress(spouse.getAddress());
        marryInfoDto.setSpouseIdNo(spouse.getIdNo());
        marryInfoDto.setSpouseMarryStatus(spouse.getMarryStatus());
        marryInfoDto.setSpouseSex(spouse.getSex());
        marryInfoDto.setSpouseNation(spouse.getNation());
        marryInfoDto.setSpousePhone(spouse.getPhone());
        marryInfoDto.setMarryId(myMarryInfo.getId());
        marryInfoDto.setBearStatus(myMarryInfo.getBearStatus());
        marryInfoDto.setHandbookStatus(myMarryInfo.getHandbookStatus());
        marryInfoDto.setHandbookTime(myMarryInfo.getHandbookTime());
        marryInfoDto.setOneBorn(myMarryInfo.getOneBorn());
        marryInfoDto.setOneBornTime(myMarryInfo.getOneBornTime());
        marryInfoDto.setContent(myMarryInfo.getContent());
        marryInfoDto.setRemark(myMarryInfo.getRemark());
        marryInfoDto.setMarryTime(myMarryInfo.getMarryTime());
        marryInfoDto.setOldSpouseList(oldSpouseList);
        return marryInfoDto;
    }
    @Transactional
    public AjaxResult addInfo(MarryInfoDto marryInfoDto){
@@ -108,7 +149,7 @@
        myself.setName(marryInfoDto.getName());
        myself.setBirthday(marryInfoDto.getBirthday());
        myself.setAddress(marryInfoDto.getAddress());
        myself.setWorkAddress(marryInfoDto.getWorkAddress());
        myself.setIdNo(marryInfoDto.getIdNo());
        myself.setMarryStatus(marryInfoDto.getMarryStatus());
        myself.setSex(marryInfoDto.getSex());
        myself.setMyId(userId);
@@ -122,7 +163,7 @@
        spouse.setName(marryInfoDto.getSpouseName());
        spouse.setBirthday(marryInfoDto.getSpouseBirthday());
        spouse.setAddress(marryInfoDto.getSpouseAddress());
        spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
        spouse.setIdNo(marryInfoDto.getSpouseIdNo());
        spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
        spouse.setSex(marryInfoDto.getSpouseSex());
        spouse.setNation(marryInfoDto.getSpouseNation());
@@ -178,7 +219,7 @@
        myself.setName(marryInfoDto.getName());
        myself.setBirthday(marryInfoDto.getBirthday());
        myself.setAddress(marryInfoDto.getAddress());
        myself.setWorkAddress(marryInfoDto.getWorkAddress());
        myself.setIdNo(marryInfoDto.getIdNo());
        myself.setMarryStatus(marryInfoDto.getMarryStatus());
        myself.setSex(marryInfoDto.getSex());
        myself.setNation(marryInfoDto.getNation());
@@ -211,7 +252,7 @@
            spouse.setName(marryInfoDto.getSpouseName());
            spouse.setBirthday(marryInfoDto.getSpouseBirthday());
            spouse.setAddress(marryInfoDto.getSpouseAddress());
            spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
            spouse.setIdNo(marryInfoDto.getSpouseIdNo());
            spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
            spouse.setSex(marryInfoDto.getSpouseSex());
            spouse.setNation(marryInfoDto.getSpouseNation());
@@ -243,7 +284,7 @@
            spouse.setName(marryInfoDto.getSpouseName());
            spouse.setBirthday(marryInfoDto.getSpouseBirthday());
            spouse.setAddress(marryInfoDto.getSpouseAddress());
            spouse.setWorkAddress(marryInfoDto.getSpouseWorkAddress());
            spouse.setIdNo(marryInfoDto.getSpouseIdNo());
            spouse.setMarryStatus(marryInfoDto.getSpouseMarryStatus());
            spouse.setSex(marryInfoDto.getSpouseSex());
            spouse.setNation(marryInfoDto.getSpouseNation());