feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>marketing</artifactId>
-	<version>v1.0.15</version>
+	<version>v1.0.16</version>
 	<name>marketing-cloud</name>
 	<description>新联康营销云</description>
 

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -42,7 +42,7 @@
             AND t.house_locking_status = #{bo.lockingStatus}
         </if>
         <if test="bo.lockingStatus == 'unlocked'">
-            AND (t.house_locking_status = #{bo.lockingStatus} || t.house_locking_status is null)
+            AND (t.house_locking_status = #{bo.lockingStatus} OR t.house_locking_status is null)
         </if>
         <if test="bo.apartmentId != null and bo.apartmentId != ''">
             AND t.apartment_id = #{bo.apartmentId}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -1020,7 +1020,7 @@ FROM
             null as channel_id,
             p.name as channelName,
             t.create_date,
-            if(v.customer_visit_id is not null || t.`status` = 2 || t.realty_consultant is not null,true,false) as visitStatus
+            if(v.customer_visit_id is not null OR t.`status` = 2 OR t.realty_consultant is not null,true,false) as visitStatus
         FROM
             ta_recommend_customer t
          left JOIN ta_person p ON t.realty_consultant = p.person_id

src/main/resources/mapper/TaShareCountMapper.xml

@@ -18,14 +18,14 @@
         select
 
         case
-        when a.title != null || a.title != '' then a.title
-        when b.title != null || b.title != '' then b.title
-        when c.activity_name != null || c.activity_name != '' then c.activity_name
-        when d.`name` != null || d.name != '' then d.`name`
-        when e.building_name != null || e.building_name != '' then e.building_name
-        when f.news_name != null || f.news_name != '' then f.news_name
-        when g.`name` != null || g.`name` != '' then g.`name`
-        when h.sales_batch_name != null || h.sales_batch_name != '' then h.sales_batch_name
+        when a.title != null or a.title != '' then a.title
+        when b.title != null or b.title != '' then b.title
+        when c.activity_name != null or c.activity_name != '' then c.activity_name
+        when d.`name` != null or d.name != '' then d.`name`
+        when e.building_name != null or e.building_name != '' then e.building_name
+        when f.news_name != null or f.news_name != '' then f.news_name
+        when g.`name` != null or g.`name` != '' then g.`name`
+        when h.sales_batch_name != null or h.sales_batch_name != '' then h.sales_batch_name
         else '空'
         end as shareTitle,t.create_date
         from ta_share_count t
@@ -39,7 +39,7 @@
         left JOIN ta_person g on t.be_share = g.person_id and t.tagert_type = 'consultant'
         where t.person_id = #{personId}
         <if test="shareType != null and shareType != ''">
-            and (t.tagert_type = #{shareType} || t.tagert_type like CONCAT(#{shareType} , '%'))
+            and (t.tagert_type = #{shareType} or t.tagert_type like CONCAT(#{shareType} , '%'))
         </if>
         <if test="shareTitle != null and shareTitle != ''">
             and
@@ -60,14 +60,14 @@
     <select id="selectClickListByParams" resultType="com.yunzhi.marketing.entity.TaShareCount">
         SELECT
             case
-                when g.title != null || g.title != '' then g.title
-                when b.title != null || b.title != '' then b.title
-                when c.activity_name != null || c.activity_name != '' then c.activity_name
-                when d.`name` != null || d.name != '' then d.`name`
-                when e.building_name != null || e.building_name != '' then e.building_name
-                when f.news_name != null || f.news_name != '' then f.news_name
-                when h.sales_batch_name != null || h.sales_batch_name !='' then h.sales_batch_name
-                WHEN y.`name` != NULL || y.`name` != '' THEN y.`name`
+                when g.title != null or g.title != '' then g.title
+                when b.title != null or b.title != '' then b.title
+                when c.activity_name != null or c.activity_name != '' then c.activity_name
+                when d.`name` != null or d.name != '' then d.`name`
+                when e.building_name != null or e.building_name != '' then e.building_name
+                when f.news_name != null or f.news_name != '' then f.news_name
+                when h.sales_batch_name != null or h.sales_batch_name !='' then h.sales_batch_name
+                WHEN y.`name` != NULL or y.`name` != '' THEN y.`name`
                 else '空'
                 end as shareTitle,
                         z.phone as personPhone,