weichaochao 5 jaren geleden
bovenliggende
commit
ae6b2ac956

+ 5
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java Bestand weergeven

518
      */
518
      */
519
     public static final String EVENT_H5 = "h5";
519
     public static final String EVENT_H5 = "h5";
520
 
520
 
521
+    /**
522
+     * 房源分享
523
+     */
524
+    public static final String HOUSE = "house";
525
+
521
     /**
526
     /**
522
      * 系统参数  通知消息次时间间隔
527
      * 系统参数  通知消息次时间间隔
523
      */
528
      */

+ 3
- 0
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java Bestand weergeven

380
                 case CommConstant.EVENT_H5:
380
                 case CommConstant.EVENT_H5:
381
                     e.setDrainageShareNum(shareNum);
381
                     e.setDrainageShareNum(shareNum);
382
                     break;
382
                     break;
383
+                case CommConstant.HOUSE:
384
+                    e.setHouseShareNum(shareNum);
385
+                    break;
383
             }
386
             }
384
         });
387
         });
385
         result.setRecords(taConsultantInfos);
388
         result.setRecords(taConsultantInfos);

+ 2
- 0
src/main/java/com/huiju/estateagents/entity/TaConsultantInfo.java Bestand weergeven

32
 
32
 
33
     private Integer drainageShareNum;
33
     private Integer drainageShareNum;
34
 
34
 
35
+    private Integer houseShareNum;
36
+
35
     private Integer buildingTypeId;
37
     private Integer buildingTypeId;
36
 
38
 
37
     private String priceType;
39
     private String priceType;

+ 1
- 1
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Bestand weergeven

347
             '2' as building_name,
347
             '2' as building_name,
348
             '3' as address,
348
             '3' as address,
349
             1 as building_type_id,
349
             1 as building_type_id,
350
-			t.tagert_type as eventType,
350
+			left(t.tagert_type,5) as eventType,
351
 			t.create_date as visit_time
351
 			t.create_date as visit_time
352
             from ta_share t
352
             from ta_share t
353
             left join ta_sales_batch g on t.be_share = g.sales_batch_id
353
             left join ta_sales_batch g on t.be_share = g.sales_batch_id

+ 4
- 4
src/main/resources/mapper/TaPreselectionRecordMapper.xml Bestand weergeven

51
 
51
 
52
     <select id="selectPreSelectRecordList" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
52
     <select id="selectPreSelectRecordList" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
53
         select t.house_id,
53
         select t.house_id,
54
-        a.block_id as blockName,
55
-        a.unit_id as unitName,
56
-        a.floor_id as floorName,
57
-        a.room_id as roomName,
54
+        a.block_name,
55
+        a.unit_name,
56
+        a.floor_name,
57
+        a.room_name,
58
         a.apartment_id,
58
         a.apartment_id,
59
         b.nickname as nameOrnick,
59
         b.nickname as nameOrnick,
60
         b.`name`,
60
         b.`name`,

+ 5
- 3
src/main/resources/mapper/TaShareCountMapper.xml Bestand weergeven

25
         when e.building_name != null || e.building_name != '' then e.building_name
25
         when e.building_name != null || e.building_name != '' then e.building_name
26
         when f.news_name != null || f.news_name != '' then f.news_name
26
         when f.news_name != null || f.news_name != '' then f.news_name
27
         when g.`name` != null || g.`name` != '' then g.`name`
27
         when g.`name` != null || g.`name` != '' then g.`name`
28
+        when h.sales_batch_name != null || h.sales_batch_name != '' then h.sales_batch_name
28
         else '空'
29
         else '空'
29
         end as shareTitle,t.create_date
30
         end as shareTitle,t.create_date
30
-
31
         from ta_share_count t
31
         from ta_share_count t
32
         left join ta_building_dynamic a on t.be_share = a.dynamic_id and t.tagert_type = 'activity'
32
         left join ta_building_dynamic a on t.be_share = a.dynamic_id and t.tagert_type = 'activity'
33
         left join ta_help_activity b on t.be_share = b.help_activity_id and t.tagert_type = 'help'
33
         left join ta_help_activity b on t.be_share = b.help_activity_id and t.tagert_type = 'help'
35
         LEFT JOIN ta_drainage d on t.be_share = d.drainage_id and t.tagert_type = 'h5'
35
         LEFT JOIN ta_drainage d on t.be_share = d.drainage_id and t.tagert_type = 'h5'
36
         left join ta_building e on t.be_share = e.building_id and t.tagert_type = 'project'
36
         left join ta_building e on t.be_share = e.building_id and t.tagert_type = 'project'
37
         LEFT JOIN ta_news f on t.be_share = f.news_id and t.tagert_type = 'news'
37
         LEFT JOIN ta_news f on t.be_share = f.news_id and t.tagert_type = 'news'
38
+        LEFT JOIN ta_sales_batch h on t.be_share = h.sales_batch_id and t.tagert_type like CONCAT('house' , '%')
38
         left JOIN ta_person g on t.be_share = g.person_id and t.tagert_type = 'consultant'
39
         left JOIN ta_person g on t.be_share = g.person_id and t.tagert_type = 'consultant'
39
         where t.person_id = #{personId}
40
         where t.person_id = #{personId}
40
         <if test="shareType != null and shareType != ''">
41
         <if test="shareType != null and shareType != ''">
41
-            and t.tagert_type = #{shareType}
42
+            and (t.tagert_type = #{shareType} || t.tagert_type like CONCAT(#{shareType} , '%'))
42
         </if>
43
         </if>
43
         <if test="shareTitle != null and shareTitle != ''">
44
         <if test="shareTitle != null and shareTitle != ''">
44
             and
45
             and
49
                 d.`name` like CONCAT('%', #{shareTitle} , '%') or
50
                 d.`name` like CONCAT('%', #{shareTitle} , '%') or
50
                 e.building_name like CONCAT('%', #{shareTitle} , '%') or
51
                 e.building_name like CONCAT('%', #{shareTitle} , '%') or
51
                 f.news_name like CONCAT('%', #{shareTitle} , '%') or
52
                 f.news_name like CONCAT('%', #{shareTitle} , '%') or
52
-                g.`name` like CONCAT('%', #{shareTitle} , '%')
53
+                g.`name` like CONCAT('%', #{shareTitle} , '%') or
54
+                h.sales_batch_name like CONCAT('%', #{shareTitle} , '%')
53
             )
55
             )
54
         </if>
56
         </if>
55
         order by t.create_date desc
57
         order by t.create_date desc