bug fix

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -518,6 +518,11 @@ public class CommConstant {
      */
     public static final String EVENT_H5 = "h5";
 
+    /**
+     * 房源分享
+     */
+    public static final String HOUSE = "house";
+
     /**
      * 系统参数  通知消息次时间间隔
      */

src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java

@@ -380,6 +380,9 @@ public class TaPersonVisitRecordController extends BaseController {
                 case CommConstant.EVENT_H5:
                     e.setDrainageShareNum(shareNum);
                     break;
+                case CommConstant.HOUSE:
+                    e.setHouseShareNum(shareNum);
+                    break;
             }
         });
         result.setRecords(taConsultantInfos);

src/main/java/com/huiju/estateagents/entity/TaConsultantInfo.java

@@ -32,6 +32,8 @@ public class TaConsultantInfo {
 
     private Integer drainageShareNum;
 
+    private Integer houseShareNum;
+
     private Integer buildingTypeId;
 
     private String priceType;

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -347,7 +347,7 @@
             '2' as building_name,
             '3' as address,
             1 as building_type_id,
-			t.tagert_type as eventType,
+			left(t.tagert_type,5) as eventType,
 			t.create_date as visit_time
             from ta_share t
             left join ta_sales_batch g on t.be_share = g.sales_batch_id

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -51,10 +51,10 @@
 
     <select id="selectPreSelectRecordList" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
         select t.house_id,
-        a.block_id as blockName,
-        a.unit_id as unitName,
-        a.floor_id as floorName,
-        a.room_id as roomName,
+        a.block_name,
+        a.unit_name,
+        a.floor_name,
+        a.room_name,
         a.apartment_id,
         b.nickname as nameOrnick,
         b.`name`,

src/main/resources/mapper/TaShareCountMapper.xml

@@ -25,9 +25,9 @@
         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
         else '空'
         end as shareTitle,t.create_date
-
         from ta_share_count t
         left join ta_building_dynamic a on t.be_share = a.dynamic_id and t.tagert_type = 'activity'
         left join ta_help_activity b on t.be_share = b.help_activity_id and t.tagert_type = 'help'
@@ -35,10 +35,11 @@
         LEFT JOIN ta_drainage d on t.be_share = d.drainage_id and t.tagert_type = 'h5'
         left join ta_building e on t.be_share = e.building_id and t.tagert_type = 'project'
         LEFT JOIN ta_news f on t.be_share = f.news_id and t.tagert_type = 'news'
+        LEFT JOIN ta_sales_batch h on t.be_share = h.sales_batch_id and t.tagert_type like CONCAT('house' , '%')
         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}
+            and (t.tagert_type = #{shareType} || t.tagert_type like CONCAT(#{shareType} , '%'))
         </if>
         <if test="shareTitle != null and shareTitle != ''">
             and
@@ -49,7 +50,8 @@
                 d.`name` like CONCAT('%', #{shareTitle} , '%') or
                 e.building_name like CONCAT('%', #{shareTitle} , '%') or
                 f.news_name like CONCAT('%', #{shareTitle} , '%') or
-                g.`name` like CONCAT('%', #{shareTitle} , '%')
+                g.`name` like CONCAT('%', #{shareTitle} , '%') or
+                h.sales_batch_name like CONCAT('%', #{shareTitle} , '%')
             )
         </if>
         order by t.create_date desc