diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java index 3da975c6..eba69c53 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroup.java @@ -153,4 +153,8 @@ public class PayWorkingGroup implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "企业联系人") private String companyContactName; + + @TableField(exist = false) + @ApiModelProperty(value = "企业名称") + private String companyName; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index ea33ec33..3c0af568 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -31,7 +31,8 @@ left join pay_meeting pm on pwg.id = pm.working_group_id left join pay_meeting_contacts pmc on pm.id = pmc.meeting_id - + left join pay_working_group_subitem pwgs on pwg.id = pwgs.working_group_id left JOIN pay_working_group_subitem_contacts pwgsc on pwgsc.working_group_sub_id = pwgs.id @@ -55,6 +56,9 @@ and pwgsc.contacts_temporary_name like concat('%', #{payWorkingGroup.companyContactName}, '%') + + and pwgs.charge_company_temporary_name like concat('%', #{payWorkingGroup.companyName}, '%') + ORDER BY pwg.create_time DESC