From 06fac01c188df139de9209763044df2d8b3492c5 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 05 六月 2023 20:14:21 +0800
Subject: [PATCH] 456

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java |   65 ++++++++++++++++++++++++++------
 1 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java
index 66f70d6..0822d3f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java
+++ b/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());

--
Gitblit v1.9.1