From ab06f7043e4192556c4d9881b0430bcb6cc75f50 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期三, 03 五月 2023 23:28:02 +0800
Subject: [PATCH] 完成家根网
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZMarryServiceImpl.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 7 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..455af82 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,16 +84,57 @@
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.setWorkAddress(myself.getWorkAddress());
+ 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.setSpouseWorkAddress(spouse.getWorkAddress());
+ 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){
SysUser user = SecurityUtils.getLoginUser().getUser();
--
Gitblit v1.9.1