From 870771d863506c9373e327f0d1477578d0cf4da2 Mon Sep 17 00:00:00 2001
From: lijiarao <136157943@qq.com>
Date: Sat, 27 Jul 2024 18:05:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B9=B4=E5=BA=A6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=94=81=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java   |  4 +++-
 .../TbMemberProjectSubitemController.java      | 18 ++++++++++++++++--
 .../member/entity/TbMemberProjectSubitem.java  | 13 ++++++++++++-
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index a17ab065..2814c208 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -83,6 +83,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.standards.memberinfo.service.IMemberInfoService;
 import com.jero.statistics.entity.MeetingPackStatistics;
 import com.jero.statistics.entity.MeetingPackStatisticsSearch;
+import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import com.jero.util.ObjRecordUtil;
@@ -1762,7 +1763,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         for (PayMeetingSituation meetingSituation : pageList) {
 
             String companyContactId = meetingSituation.getCompanyContactId();
-            PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
+            String companyContactTemporaryId = meetingSituation.getCompanyContactTemporaryId();
+            PayContactsManagementTemporary contactsManagement = contactsManagementTemporaryService.getByAllTable(companyContactId, companyContactTemporaryId);
             meetingSituation.setCompanyContactName(contactsManagement.getName());
             if (!MeetingCommon.INTERNATIONAL_MEETING.equals(meetingType1)){
                 meetingSituation.setPost(contactsManagement.getPost());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
index c1ec582f..9cdce667 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
@@ -27,6 +27,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.member.vo.*;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.entity.PayContactsManagementTemporary;
+import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
+import com.jero.temporary.service.IPayContactsManagementTemporaryService;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.common.system.base.controller.JeroController;
 import org.apache.commons.lang3.StringUtils;
@@ -60,6 +64,11 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	 private IPayCompanyManagementService payCompanyManagementService;
 	 @Resource
 	 private IPayContactsManagementService payContactsManagementService;
+
+	 @Resource
+	 private IPayCompanyManagementTemporaryService companyManagementTemporaryService;
+	 @Resource
+	 private IPayContactsManagementTemporaryService contactsManagementTemporaryService;
 	/**
 	 * 分页列表查询
 	 */
@@ -298,17 +307,22 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 		}
 		for (TbMemberProjectSubitem memberProjectSubitem : exportList) {
 			String companyId = memberProjectSubitem.getCompanyId();
+			String companyTemporaryId = memberProjectSubitem.getCompanyTemporaryId();
 			String liaisonManId = memberProjectSubitem.getLiaisonManId();
+			String companyContactTemporaryId = memberProjectSubitem.getCompanyContactTemporaryId();
 			if (StringUtils.isNotBlank(companyId)) {
-				PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(companyId);
+				PayCompanyManagementTemporary payCompanyManagement = companyManagementTemporaryService.getByAllTable(companyId, companyTemporaryId);
 				if (!Objects.isNull(payCompanyManagement)) {
 					memberProjectSubitem.setDutyCode(payCompanyManagement.getDutyCode());
 				}
 			}
 			if (StringUtils.isNotBlank(liaisonManId)) {
-				PayContactsManagement payContactsManagement = payContactsManagementService.getById(liaisonManId);
+				PayContactsManagementTemporary payContactsManagement = contactsManagementTemporaryService.getByAllTable(liaisonManId, companyContactTemporaryId);
 				if (!Objects.isNull(payContactsManagement)) {
 					memberProjectSubitem.setEmail(payContactsManagement.getEmail());
+					memberProjectSubitem.setMobile(PasswordUtil.decrypt(payContactsManagement.getPhone()));
+					memberProjectSubitem.setContactAddress(payContactsManagement.getContactAddress());
+					memberProjectSubitem.setPostalCode(payContactsManagement.getPostalCode());
 				}
 			}
 		}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
index f8eb3f8f..ab0146cb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
@@ -131,10 +131,21 @@ public class TbMemberProjectSubitem implements Serializable {
     private String email;
 
     /**手机*/
-    //@Excel(name = "手机", width = 15,exportConvert = true)
+    @Excel(name = "手机", width = 15,exportConvert = true)
     @ApiModelProperty(value = "手机")
     private String mobile;
 
+    /**通讯地址*/
+    @Excel(name = "通讯地址", width = 15)
+    @ApiModelProperty(value = "通讯地址")
+    @TableField(exist = false)
+    private java.lang.String contactAddress;
+    /**邮政编码*/
+    @Excel(name = "邮政编码", width = 15)
+    @ApiModelProperty(value = "邮政编码")
+    @TableField(exist = false)
+    private java.lang.String postalCode;
+
     /**会员状态*/
     //@Excel(name = "会员状态", width = 15, dicCode = "member_status")
     @ApiModelProperty(value = "会员状态")