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 c87361b2..d3bde872 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 @@ -84,11 +84,17 @@ public class PayMemberProjectSubitem implements Serializable { /** * 企业id */ + private String companyId; + + /** + * 企业临时id + */ @Excel(name = "会员单位", width = 15, dictTable = "pay_company_management_temporary", dicText = "company_name", dicCode = "id",orderNum = "1") @ApiModelProperty(value = "企业id") @NotBlank(message = "会员单位不能为空") @Size(max = 50, message = "会员单位最大为50字符") - private String companyId; + private String companyTemporaryId; + /** * 企业名称 @@ -99,11 +105,16 @@ public class PayMemberProjectSubitem implements Serializable { /** * 企业联系人id */ + private String companyContactId; + + /** + * 企业联系人临时id + */ @Excel(name = "企业联系人名称", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "2") @ApiModelProperty(value = "企业联系人id") @NotBlank(message = "企业联系人不能为空") @Size(max = 50, message = "企业联系人最大为50字符") - private String companyContactId; + private String companyContactTemporaryId; /** * 企业联系人名称 @@ -114,10 +125,15 @@ public class PayMemberProjectSubitem implements Serializable { /** * 邮寄联系人id */ + private String postContactId; + + /** + * 邮寄联系人临时id + */ @Excel(name = "邮寄联系人姓名", width = 15, dictTable = "pay_contacts_management_temporary", dicText = "name", dicCode = "id",orderNum = "3") @ApiModelProperty(value = "邮寄联系人id") @NotBlank(message = "邮寄联系人不能为空") - private String postContactId; + private String postContactTemporaryId; /** * 邮寄联系人姓名 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml index 88238ba4..5463e5d3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml @@ -9,10 +9,13 @@ + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java index 9cbf7c98..3c7a83d9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java @@ -86,18 +86,18 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl ids) { for (String id : ids) { - PayMemberProjectSubitem payMemberProjectSubitem = getById(id); - //删除临时表数据 - String companyId = payMemberProjectSubitem.getCompanyId(); - companyManagementTemporaryService.removeById(companyId); - - String companyContactId = payMemberProjectSubitem.getCompanyContactId(); - contactsManagementTemporaryService.removeById(companyContactId); - - String postContactId = payMemberProjectSubitem.getPostContactId(); - contactsManagementTemporaryService.removeById(postContactId); + delectTemporaryById(id); } removeByIds(ids); }