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 27ced072..3da975c6 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
@@ -149,4 +149,8 @@ public class PayWorkingGroup implements Serializable {
*/
@TableField(exist = false)
private String principalB;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "企业联系人")
+ private String companyContactName;
}
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 a06052c5..944b7820 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
@@ -19,7 +19,7 @@
charge_notice_no_b AS chargeNoticeNoB,
charge_notice_b_id AS chargeNoticeBId,
mission_and_objectives AS missionAndObjectives,
- remarks,
+ pwg.remarks,
pwg.create_by AS createBy,
pwg.create_time AS createTime,
pwg.update_by AS updateBy,
@@ -31,6 +31,10 @@
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
+
AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%'))
@@ -48,6 +52,9 @@
OR pmc.meeting_contacts_id = #{payWorkingGroup.principalA}
)
+
+ and pwgsc.contacts_temporary_name like concat('%', #{payWorkingGroup.companyContactName}, '%')
+
ORDER BY pwg.create_time DESC
@@ -399,6 +406,9 @@
and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{allProjectStatisticsSearch.billYear}, '%')
+
+ and contactsName like concat('%', #{allProjectStatisticsSearch.companyContactName}, '%')
+
group by v.projectId) p
@@ -485,6 +495,9 @@
and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{allProjectStatisticsSearch.billYear}, '%')
+
+ and contactsName like concat('%', #{allProjectStatisticsSearch.companyContactName}, '%')
+
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java
index b4f5540a..4049bd75 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatisticsSearch.java
@@ -53,4 +53,7 @@ public class AllProjectStatisticsSearch {
@ApiModelProperty(value = "排序规则")
private String order;
+
+ @ApiModelProperty(value = "企业联系人")
+ private String companyContactName;
}