LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改#41154

Browse Source
This commit is contained in:
梁琦涛
2021-10-21 17:09:24 +08:00
parent f20a8596b7
commit 53dc2227df
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+15 -3
View File
@@ -27,6 +27,8 @@ import com.jero.contract.service.IPayIncomeContractService;
import com.jero.contract.vo.*; import com.jero.contract.vo.*;
import com.jero.mail.entity.PayMailContract; import com.jero.mail.entity.PayMailContract;
import com.jero.mail.service.IPayMailContractService; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -75,6 +77,8 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
private IPayIncomeContractAssociatedService payIncomeContractAssociatedService; private IPayIncomeContractAssociatedService payIncomeContractAssociatedService;
@Resource @Resource
private IPayMailContractService payMailContractService; private IPayMailContractService payMailContractService;
@Resource
private ISysUserService sysUserService;
/** /**
* 分页列表查询 * 分页列表查询
@@ -435,9 +439,17 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
LambdaQueryWrapper<PayMailContract> queryPayMailContract = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PayMailContract> queryPayMailContract = new LambdaQueryWrapper<>();
queryPayMailContract.eq(PayMailContract::getContractId,id); queryPayMailContract.eq(PayMailContract::getContractId,id);
queryPayMailContract.eq(PayMailContract::getPostStatus,PayIncomeContractCommon.POST_STATUS1); queryPayMailContract.eq(PayMailContract::getPostStatus,PayIncomeContractCommon.POST_STATUS1);
PayMailContract payMailContract = payMailContractService.getOne(queryPayMailContract); List<PayMailContract> listPayMailContract = payMailContractService.list(queryPayMailContract);
if(!Objects.isNull(payMailContract)){ if(!CollectionUtils.isEmpty(listPayMailContract)){
payIncomeContractDetailOutput.setPayMailContract(payMailContract); if(!StringUtils.isEmpty(listPayMailContract.get(0).getMailer())){
LambdaQueryWrapper<SysUser> querySysUserNew = new LambdaQueryWrapper<>();
querySysUserNew.eq(SysUser::getUsername,listPayMailContract.get(0).getMailer());
List<SysUser> 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)){ if(!CollectionUtils.isEmpty(listProject)){
listProject.forEach(p->{ listProject.forEach(p->{
jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContract.java
+5
View File
@@ -2,6 +2,7 @@ package com.jero.mail.entity;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@@ -87,4 +88,8 @@ public class PayMailContract implements Serializable {
/**邮寄人*/ /**邮寄人*/
@ApiModelProperty(value = "邮寄人") @ApiModelProperty(value = "邮寄人")
private String mailer; private String mailer;
/**邮寄人姓名（详情使用）*/
@ApiModelProperty(value = "邮寄人(详情使用）")
@TableField(exist = false)
private String mailName;
} }