bug fix

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -52,6 +52,7 @@
     </select>
 
     <select id="selectPreSelectRecordList" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
+        select * from (
         select t.house_id,
         a.block_name,
         a.unit_name,
@@ -68,17 +69,18 @@
         t.building_id,
         t.sales_batch_id,
         e.apartment_name,
+        b.person_id,
         (select name from ta_person t where (t.user_id = t.update_user || t.person_id = t.update_user)) as updateName
         from ta_preselection_record t
         left join ta_housing_resources a on t.house_id = a.house_id
         left join ta_person b on t.person_id = b.person_id
         LEFT JOIN ta_building_apartment e ON a.apartment_id = e.apartment_id
         where b.org_id = #{orgId} and a.sales_batch_id = #{salesBatchId}
-        <if test="houseId != null and houseId !=''">
-          and t.house_id = #{houseId}
+        <if test="houseId != null and houseId !=''">and t.house_id = #{houseId}
         </if>
         <if test="phone != null and phone != ''">
-          and b.phone = #{phone}
+            and b.
+            phone = #{phone}
         </if>
         <if test="apartmentId != null and apartmentId != ''">
           and a.apartment_id = #{apartmentId}
@@ -86,6 +88,7 @@
         <if test="status != null">
           and t.status = #{status}
         </if>
+        order by t.create_date desc) t group by t.house_id, t.person_id
     </select>
 
 </mapper>

src/main/resources/mapper/TaShareCountMapper.xml

@@ -66,6 +66,7 @@
                 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 a.`name` != null || a.`name` != '' then a.`name`
                 else '空'
                 end as shareTitle,
@@ -82,7 +83,7 @@
                 LEFT JOIN ta_drainage d on t.target_id = d.drainage_id and t.target_type = 'h5_share'
                 left join ta_building e on t.target_id = e.building_id and t.target_type = 'building_share'
                 LEFT JOIN ta_news f on t.target_id = f.news_id and t.target_type = 'news_share'
-
+                left join ta_sales_batch h on t.target_id = h.sales_batch_id and t.target_type = 'house_share'
         LEFT JOIN ta_person a ON t.share_person = a.person_id
         LEFT JOIN ta_person y on t.share_person = y.user_id
         LEFT JOIN ta_person z ON t.person_id = z.person_id
@@ -104,6 +105,7 @@
             e.building_name like CONCAT('%', #{shareTitle} , '%') or
             f.news_name like CONCAT('%', #{shareTitle} , '%') or
             a.`name` like CONCAT('%', #{shareTitle} , '%')
+            h.sales_batch_name like like CONCAT('%', #{shareTitle} , '%')
             )
         </if>
         GROUP BY

src/main/resources/mapper/TaSharePersonFromMapper.xml

@@ -39,7 +39,14 @@
             and c.person_Type = #{personType}
         </if>
         <if test="sceneType != null and sceneType != ''">
-            and b.scene_type = #{sceneType}
+            <choose>
+                <when test="sceneType == 'share'">
+                    and b.scene_type like CONCAT('%', #{sceneType})
+                </when>
+                <otherwise>
+                    and b.scene_type = #{sceneType}
+                </otherwise>
+            </choose>
         </if>
         <if test="phone != null and phone != ''">
             and c.phone = #{phone}