From 99359c346dec924c35880db7b61960391474622d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sat, 6 May 2023 10:09:44 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=AF=BC=E5=87=BA=E8=B5=84=E6=96=99?= =?UTF-8?q?=E7=BD=91=E5=91=98=E6=88=90=E5=91=98=E6=97=B6=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=82=AE=E5=AF=84=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayMemberProjectSubitemController.java | 8 ++++ .../entity/PayMemberProjectSubitem.java | 42 ++++++++++++------- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 3344b0d2..b1045189 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -229,6 +229,14 @@ public class PayMemberProjectSubitemController extends JeroController selectionList = Arrays.asList(selections.split(",")); pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); } + for (PayMemberProjectSubitem memberProjectSubitem : pageList) { + String postContactId = memberProjectSubitem.getPostContactId(); + PayContactsManagement contactsManagement = contactsManagementService.getById(postContactId); + memberProjectSubitem.setPostContactPhone(PasswordUtil.decrypt(contactsManagement.getPhone())); + memberProjectSubitem.setPostContactMail(PasswordUtil.decrypt(contactsManagement.getEmail())); + memberProjectSubitem.setPostContactAddress(contactsManagement.getContactAddress()); + memberProjectSubitem.setContactPostCode(contactsManagement.getPostalCode()); + } return super.exportListXls(pageList, PayMemberProjectSubitem.class, "会员项目成员表"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index a4f09b58..e19a90e3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -137,6 +137,26 @@ public class PayMemberProjectSubitem implements Serializable { @Excel(name = "邮寄联系人", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3") private String postContactTemporaryId; + @Excel(name = "邮寄联系人手机号", width = 17, orderNum = "4") + @ApiModelProperty(value = "邮寄联系人手机号") + @TableField(exist = false) + private String postContactPhone; + + @Excel(name = "邮寄联系人邮箱", width = 15, orderNum = "5") + @ApiModelProperty(value = "邮寄联系人邮箱") + @TableField(exist = false) + private String postContactMail; + + @Excel(name = "邮寄联系人通讯地址", width = 19, orderNum = "6") + @ApiModelProperty(value = "邮寄联系人地址") + @TableField(exist = false) + private String postContactAddress; + + @Excel(name = "邮寄联系人邮政编码", width = 19, orderNum = "7") + @ApiModelProperty(value = "邮寄联系人邮编") + @TableField(exist = false) + private String contactPostCode; + /** * 邮寄联系人姓名 */ @@ -146,7 +166,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 应收金额 */ - @Excel(name = "应收金额", width = 15,orderNum = "4") + @Excel(name = "应收金额", width = 15,orderNum = "8") @JsonFormat(shape = JsonFormat.Shape.STRING) @ApiModelProperty(value = "应收金额") @NotNull(message = "应收金额不能为空") @@ -170,7 +190,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 来款方式 */ - @Excel(name = "来款方式", width = 15, dicCode = "payment_type",orderNum = "7") + @Excel(name = "来款方式", width = 15, dicCode = "payment_type",orderNum = "11") @ApiModelProperty(value = "来款方式(2:合同，3:收费通知)") @Dict(dicCode = "payment_type") @Max(3) @@ -179,7 +199,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 收费通知号 */ - @Excel(name = "收费通知号", width = 15,orderNum = "8") + @Excel(name = "收费通知号", width = 15,orderNum = "12") @ApiModelProperty(value = "收费通知号") @NotBlank(message = "收费通知号不能为空", groups = ChargeNotice.class) @Size(max = 50, message = "收费通知号最大为50字符", groups = ChargeNotice.class) @@ -194,7 +214,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 合同号 */ - @Excel(name = "合同号", width = 15,orderNum = "9") + @Excel(name = "合同号", width = 15,orderNum = "13") @ApiModelProperty(value = "合同号") @NotBlank(message = "合同号不能为空", groups = Contract.class) @Size(max = 50, message = "合同号最大为50字符", groups = Contract.class) @@ -203,7 +223,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 备注 */ - @Excel(name = "备注", width = 15,orderNum = "10") + @Excel(name = "备注", width = 15,orderNum = "14") @ApiModelProperty(value = "备注") @Size(max = 200, message = "备注最大为200个字符") private String remark; @@ -218,7 +238,7 @@ public class PayMemberProjectSubitem implements Serializable { /** * 需要发票 */ - @Excel(name = "需要发票", width = 15, dicCode = "invoice_type",orderNum = "6") + @Excel(name = "需要发票", width = 15, dicCode = "invoice_type",orderNum = "10") @ApiModelProperty(value = "需要发票") @Dict(dicCode = "invoice_type") @Min(0) @@ -365,15 +385,5 @@ public class PayMemberProjectSubitem implements Serializable { //@TableField(exist = false) //private String postContactName; - @ApiModelProperty(value = "邮寄联系人手机号") - @TableField(exist = false) - private String postContactPhone; - @ApiModelProperty(value = "邮寄联系人地址") - @TableField(exist = false) - private String postContactAddress; - - @ApiModelProperty(value = "邮寄联系人邮编") - @TableField(exist = false) - private String contactPostCode; }