From 82b63d6db0f8e787594a2efbfcaee00c610d6f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E4=BC=8F=E4=BC=BD?= <fujia.chen@hao168.com>
Date: Thu, 19 Oct 2023 16:15:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=92=8C=E5=85=A8=E9=87=8F?=
 =?UTF-8?q?=E7=A7=81=E6=B5=B7=E5=88=97=E8=A1=A8sql=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HyPartnerLineInfoMapper.xml        | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
index 659199313..9ded68729 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
@@ -562,12 +562,30 @@
     <if test="updateStartTime!=null and updateEndTime!=null">
       AND hpli.update_time BETWEEN #{updateStartTime} and #{updateEndTime}
     </if>
+    <if test="lineStartTime != null and lineEndTime != null">
+      AND hpli.create_time BETWEEN #{lineStartTime} and #{lineEndTime}
+    </if>
     <if test="intentAreaName!=null and intentAreaName!=''">
       and hoai.area_path like  concat('%/',#{intentAreaName},'/%')
     </if>
     <if test="acceptAdjustType!=null">
       AND hpuinfo.accept_adjust_type = #{acceptAdjustType}
     </if>
+    <if test="partnerName !=null and partnerName!=''">
+      AND hpuinfo.username like concat('%',#{partnerName},'%')
+    </if>
+    <if test="partnerMobile !=null and partnerMobile!=''">
+      AND hpuinfo.mobile like concat('%',#{partnerMobile},'%')
+    </if>
+    <if test="investmentManagerId !=null and investmentManagerId!=''">
+      AND hpli.investment_manager = #{investmentManagerId}
+    </if>
+    <if test="intentAreaId  !=  null and intentAreaId !='' and intentAreaQueryType!=null and intentAreaQueryType='contains'">
+      AND hpuinfo.want_shop_area = #{intentAreaId}
+    </if>
+    <if test="intentAreaId  !=  null and intentAreaId !='' and intentAreaQueryType!=null and intentAreaQueryType='notContains'">
+      AND hpuinfo.want_shop_area != #{intentAreaId}
+    </if>
     <if test="storeKeyword!=null and storeKeyword!='' and storeKeywordType!=null and storeKeywordType=='storeCode'">
       AND hpuinfo.shop_code  like concat('%',#{storeKeyword},'%')
     </if>
@@ -585,16 +603,26 @@
         #{userId}
       </foreach>
     </if>
-    <if test="userPortraitIdList!=null and userPortraitIdList.size>0">
-      <foreach collection="userPortraitIdList" separator="or" open="and (" close=")" item="userPortraitId">
-        bi.user_portrait like concat("%,", #{userPortraitId}, ",%")
+    <if test="userPortraitIdList!=null and userPortraitIdList.size>0 and userPortraitQueryType!=null and userPortraitQueryType='contains'">
+      <foreach collection="userPortraitIdList" open="and bi.user_portrait in (" close=")" separator="," item="userPortraitId">
+         #{userPortraitId}
       </foreach>
     </if>
-    <if test="userChannelIdList!=null and userChannelIdList.size>0">
+    <if test="userPortraitIdList!=null and userPortraitIdList.size>0 and userPortraitQueryType!=null and userPortraitQueryType='notContains'">
+      <foreach collection="userPortraitIdList" open="and bi.user_portrait not in (" close=")" separator="," item="userPortraitId">
+        #{userPortraitId}
+      </foreach>
+    </if>
+    <if test="userChannelIdList!=null and userChannelIdList.size>0 and userChannelQueryType!=null and userChannelQueryType='contains' ">
       <foreach collection="userChannelIdList" open="and hpuinfo.user_channel_id in (" close=")" separator="," item="userChannelId">
         #{userChannelId}
       </foreach>
     </if>
+    <if test="userChannelIdList!=null and userChannelIdList.size>0 and userChannelQueryType!=null and userChannelQueryType='notContains' ">
+      <foreach collection="userChannelIdList" open="and hpuinfo.user_channel_id not in (" close=")" separator="," item="userChannelId">
+        #{userChannelId}
+      </foreach>
+    </if>
     <if test="userIdList!=null and userIdList.size==0 and developmentManagerList!=null and developmentManagerList.size>0">
       <foreach collection="developmentManagerList" item="developmentManager" open="and hpli.development_manager in (" close=")" separator=",">
         #{developmentManager}