add 工作组管理和全所统计增加“企业联系人”的查询条件

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;
 }

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>
     <!--    全所统计导出-->

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;
 }