消息修改

jero-boot-incoming-payment/src/main/java/com/jero/mail/PayMailBillVO.java

@@ -21,7 +21,4 @@ public class PayMailBillVO extends PayMailBill {
      */
     @TableField(exist = false)
     List<PayMailBillProject> bmpList;
-
-
-
 }

jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java

@@ -92,6 +92,9 @@ public class PayMailBill implements Serializable {
 	@Excel(name = "联系人手机号", width = 15)
     @ApiModelProperty(value = "联系人手机号")
     private java.lang.String contactMobile;
+    /** 联系人邮箱*/
+    @ApiModelProperty(value = "联系人邮箱")
+    private String email;
 	/**开票时间*/
 	@Excel(name = "开票时间", width = 15, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java

@@ -11,13 +11,13 @@ import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.mapper.PayContactsManagementMapper;
+import com.jero.company.service.IPayContactsManagementService;
 import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.mail.PayMailBillVO;
 import com.jero.mail.entity.BillingInfo;
 import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.entity.PayMailBillProject;
 import com.jero.mail.mapper.PayMailBillMapper;
-import com.jero.mail.mapper.PayMailBillProjectMapper;
 import com.jero.mail.service.IPayMailBillProjectService;
 import com.jero.mail.service.IPayMailBillService;
 import com.jero.meeting.entity.PayMeeting;
@@ -40,7 +40,6 @@ import com.jero.project.mapper.PayWorkingGroupMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -48,6 +47,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -58,9 +58,9 @@ import java.util.stream.Collectors;
  */
 @Service
 public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMailBill> implements IPayMailBillService {
-    @Autowired
+    @Resource
     private IPayMailBillService payMailBillService;
-    @Autowired
+    @Resource
     private IPayMailBillProjectService payMailBillProjectService;
     @Resource
     private PayCommonProjectMapper payCommonProjectMapper;
@@ -84,6 +84,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private PayContactsManagementMapper payContactsManagementMapper;
     @Resource
     private PayMailBillMapper payMailBillMapper;
+    @Resource
+    private IPayContactsManagementService payContactsManagementService;
 
     @Override
     public List<PayMailBill> selectMailBillVO(String projectId) {
@@ -155,6 +157,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     projectName,chargeCompanyName,principalName,principalId,
                     i,bmpList.size());
         }
+        PayContactsManagement payContactsManagement = payContactsManagementService.getById(payMailBill.getContactId());
+        if(!Objects.isNull(payContactsManagement) && StringUtils.isEmpty(payContactsManagement.getEmail())){
+            payMailBill.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail()));
+        }
         payMailBill.setProjectName(projectName.toString());
         payMailBill.setChargeCompanyName(chargeCompanyName.toString());
         payMailBill.setPrincipalName(principalName.toString());