From 53dc2227dfb667fcca53176ea07b81ffed38396c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com> Date: Thu, 21 Oct 2021 17:09:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9#41154?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayIncomeContractController.java | 18 +++++++++++++++--- .../com/jero/mail/entity/PayMailContract.java | 5 +++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java index 3f1ecf2e..c661872d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java @@ -27,6 +27,8 @@ import com.jero.contract.service.IPayIncomeContractService; import com.jero.contract.vo.*; import com.jero.mail.entity.PayMailContract; import com.jero.mail.service.IPayMailContractService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -75,6 +77,8 @@ public class PayIncomeContractController extends JeroController queryPayMailContract = new LambdaQueryWrapper<>(); queryPayMailContract.eq(PayMailContract::getContractId,id); queryPayMailContract.eq(PayMailContract::getPostStatus,PayIncomeContractCommon.POST_STATUS1); - PayMailContract payMailContract = payMailContractService.getOne(queryPayMailContract); - if(!Objects.isNull(payMailContract)){ - payIncomeContractDetailOutput.setPayMailContract(payMailContract); + List listPayMailContract = payMailContractService.list(queryPayMailContract); + if(!CollectionUtils.isEmpty(listPayMailContract)){ + if(!StringUtils.isEmpty(listPayMailContract.get(0).getMailer())){ + LambdaQueryWrapper querySysUserNew = new LambdaQueryWrapper<>(); + querySysUserNew.eq(SysUser::getUsername,listPayMailContract.get(0).getMailer()); + List listSysUserNew = sysUserService.list(querySysUserNew); + if(!CollectionUtils.isEmpty(listSysUserNew)){ + listPayMailContract.get(0).setMailName(listSysUserNew.get(0).getRealname()); + } + } + payIncomeContractDetailOutput.setPayMailContract(listPayMailContract.get(0)); } if(!CollectionUtils.isEmpty(listProject)){ listProject.forEach(p->{ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java index 112e2231..66876e60 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java @@ -2,6 +2,7 @@ package com.jero.mail.entity; import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -87,4 +88,8 @@ public class PayMailContract implements Serializable { /**邮寄人*/ @ApiModelProperty(value = "邮寄人") private String mailer; + /**邮寄人姓名（详情使用）*/ + @ApiModelProperty(value = "邮寄人(详情使用）") + @TableField(exist = false) + private String mailName; }