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

update:标协成员导出的邮箱字段

Browse Source
This commit is contained in:
sunzheng
2024-07-11 10:28:28 +08:00
parent 4eb3b5e5a5
commit 07da0214b0
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
+13
View File
@@ -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, "标协会员项目成员表");
}
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+1 -1
View File
@@ -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 && <总金额（半满标志）））")