From b2c8a2e78c1c2933b595d437b58a87f478773fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Tue, 19 Oct 2021 15:12:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40894?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/ProjectDetailServiceImpl.java | 8 ++++++++ .../main/java/com/jero/mail/entity/PayMailBill.java | 8 +++++++- .../project/controller/PayCommonProjectController.java | 10 ++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 93931340..5140eae9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -236,6 +236,14 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(!CollectionUtils.isEmpty(listSysUser)){ p.setRealName(listSysUser.get(0).getRealname()); } + if(!StringUtils.isEmpty(p.getMailer())){ + LambdaQueryWrapper querySysUserNew = new LambdaQueryWrapper<>(); + querySysUserNew.eq(SysUser::getUsername,p.getMailer()); + List listSysUserNew = sysUserService.list(querySysUserNew); + if(!CollectionUtils.isEmpty(listSysUserNew)){ + p.setMailName(listSysUserNew.get(0).getRealname()); + } + } }); projectDetailVO.setMailBill(listPayMailBillVO); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java index 08e809a8..92dea5e8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBill.java @@ -150,10 +150,16 @@ public class PayMailBill implements Serializable { @ApiModelProperty(value = "通讯地址") @NotNull(message = "通讯地址") private java.lang.String contactAddress; + /** + * 开票人（真是姓名） + */ + @TableField(exist = false) + @ApiModelProperty(value = "开票人（真是姓名）") + private String realName; /** * 邮寄人（真是姓名） */ @TableField(exist = false) @ApiModelProperty(value = "邮寄人（真是姓名）") - private String realName; + private String mailName; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 37c141d2..955293fb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -482,12 +482,22 @@ public class PayCommonProjectController extends JeroController querySysUser = new LambdaQueryWrapper<>(); querySysUser.eq(SysUser::getUsername,p.getCreateBy()); List listSysUser = sysUserService.list(querySysUser); if(!CollectionUtils.isEmpty(listSysUser)){ p.setRealName(listSysUser.get(0).getRealname()); } + + if(!StringUtils.isEmpty(p.getMailer())){ + LambdaQueryWrapper querySysUserNew = new LambdaQueryWrapper<>(); + querySysUserNew.eq(SysUser::getUsername,p.getMailer()); + List listSysUserNew = sysUserService.list(querySysUserNew); + if(!CollectionUtils.isEmpty(listSysUserNew)){ + p.setMailName(listSysUserNew.get(0).getRealname()); + } + } }); payCompanyCommonProject.setMailBill(listPayMailBillVO); }