From e5c673e374e3635065a4bf6cb41f1d2a0b0d7978 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 10 Jun 2022 14:59:34 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=92=8C=E5=85=A8=E6=89=80=E7=BB=9F=E8=AE=A1=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E2=80=9C=E4=BC=81=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA?=
 =?UTF-8?q?=E2=80=9D=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/project/entity/PayWorkingGroup.java  |  4 ++++
 .../project/mapper/xml/PayWorkingGroupMapper.xml  | 15 ++++++++++++++-
 .../entity/AllProjectStatisticsSearch.java        |  3 +++
 3 files changed, 21 insertions(+), 1 deletion(-)

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
         </if>
+        <if test="payWorkingGroup.companyContactName != null and payWorkingGroup.companyContactName != ''">
+            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
+        </if>
         <where>
             <if test="payWorkingGroup.workingGroupProject != null and payWorkingGroup.workingGroupProject != ''">
                 AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%'))
@@ -48,6 +52,9 @@
                     OR pmc.meeting_contacts_id = #{payWorkingGroup.principalA}
                     )
             </if>
+            <if test="payWorkingGroup.companyContactName != null and payWorkingGroup.companyContactName != ''">
+                and pwgsc.contacts_temporary_name like concat('%', #{payWorkingGroup.companyContactName}, '%')
+            </if>
         </where>
         ORDER BY pwg.create_time DESC
     </select>
@@ -399,6 +406,9 @@
             <if test="allProjectStatisticsSearch.billYear != null and allProjectStatisticsSearch.billYear != ''">
                 and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{allProjectStatisticsSearch.billYear}, '%')
             </if>
+            <if test="allProjectStatisticsSearch.companyContactName != null and allProjectStatisticsSearch.companyContactName != ''">
+                and contactsName like concat('%', #{allProjectStatisticsSearch.companyContactName}, '%')
+            </if>
         </where>
         group by v.projectId) p
         <if test="allProjectStatisticsSearch.column != null and allProjectStatisticsSearch.column != ''">
@@ -485,6 +495,9 @@
             <if test="allProjectStatisticsSearch.billYear != null and allProjectStatisticsSearch.billYear != ''">
                 and DATE_FORMAT (pmb.bill_date,'%Y') like concat(#{allProjectStatisticsSearch.billYear}, '%')
             </if>
+            <if test="allProjectStatisticsSearch.companyContactName != null and allProjectStatisticsSearch.companyContactName != ''">
+                and contactsName like concat('%', #{allProjectStatisticsSearch.companyContactName}, '%')
+            </if>
         </where>
     </select>
     <!--    全所统计导出-->
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;
 }