From 07da0214b0e173f4150b3e6e33d58b038cf94bc1 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Thu, 11 Jul 2024 10:28:28 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=A0=87=E5=8D=8F=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E9=82=AE=E7=AE=B1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TbMemberProjectSubitemController.java           | 13 +++++++++++++
 .../jero/member/entity/TbMemberProjectSubitem.java  |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

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 8665981d..3269762a 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
@@ -7,6 +7,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
@@ -15,7 +17,9 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.company.entity.PayCompanyManagement;
+import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayCompanyManagementService;
+import com.jero.company.service.IPayContactsManagementService;
 import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.service.ITbMemberProjectSubitemService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -53,6 +57,8 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	 private ISysBaseAPI sysBaseAPI;
 	 @Resource
 	 private IPayCompanyManagementService payCompanyManagementService;
+	 @Resource
+	 private IPayContactsManagementService payContactsManagementService;
 	/**
 	 * 分页列表查询
 	 */
@@ -291,12 +297,19 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 		}
 		for (TbMemberProjectSubitem memberProjectSubitem : exportList) {
 			String companyId = memberProjectSubitem.getCompanyId();
+			String liaisonManId = memberProjectSubitem.getLiaisonManId();
 			if (StringUtils.isNotBlank(companyId)) {
 				PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(companyId);
 				if (!Objects.isNull(payCompanyManagement)) {
 					memberProjectSubitem.setDutyCode(payCompanyManagement.getDutyCode());
 				}
 			}
+			if (StringUtils.isNotBlank(liaisonManId)) {
+				PayContactsManagement payContactsManagement = payContactsManagementService.getById(liaisonManId);
+				if (!Objects.isNull(payContactsManagement)) {
+					memberProjectSubitem.setEmail(payContactsManagement.getEmail());
+				}
+			}
 		}
         return super.exportListXls(exportList, TbMemberProjectSubitem.class, "标协会员项目成员表");
     }
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 ee0c046f..4d51a800 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
@@ -209,7 +209,7 @@ public class TbMemberProjectSubitem implements Serializable {
 
     /**开票*/
     @ApiModelProperty(value = "开票")
-    @Excel(name = "收否开票", width = 15, dicCode = "make_invoice_type")
+    @Excel(name = "是否开票", width = 15, dicCode = "make_invoice_type")
     private Integer makeInvoice;
 
     @ApiModelProperty(value = "确认收入（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））")