bug fix

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

@@ -212,14 +212,14 @@ public class TaPreselectionRecordController extends BaseController {
     public ResponseBean selectPreSelectRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                   @RequestParam(value = "salesBatchId") String salesBatchId,
-                                                  @RequestParam(value = "houseId", required = false) Integer houseId,
+                                                  @RequestParam(value = "house", required = false) Integer house,
                                                   @RequestParam(value = "phone", required = false) String phone,
                                                   @RequestParam(value = "apartmentId", required = false) String apartmentId,
                                                   @RequestParam(value = "status", required = false) Integer status,
                                                   HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaPreselectionRecordService.selectPreSelectRecordList(pageNum, pageSize, salesBatchId, houseId, getOrgId(request), phone, apartmentId, status);
+            responseBean = iTaPreselectionRecordService.selectPreSelectRecordList(pageNum, pageSize, salesBatchId, house, getOrgId(request), phone, apartmentId, status);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesList -=- {}", e.toString());

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

@@ -89,4 +89,7 @@ public class TaSharePersonFrom implements Serializable {
 
     @TableField(exist = false)
     private String photoOravatar;
+
+    @TableField(exist = false)
+    private String salesBatchName;
 }

src/main/java/com/huiju/estateagents/po/TaPreselectionRecordPO.java

@@ -48,6 +48,11 @@ public class TaPreselectionRecordPO extends TaPreselectionRecord {
      */
     private String apartmentId;
 
+    /**
+     * 户型名称
+     */
+    private String apartmentName;
+
     /**
      * 楼盘名称
      */

src/main/java/com/huiju/estateagents/service/impl/TaSharePersonFromServiceImpl.java

@@ -39,6 +39,10 @@ public class TaSharePersonFromServiceImpl extends ServiceImpl<TaSharePersonFromM
 
     @Autowired
     private TaSharePersonFromMapper taSharePersonFromMapper;
+
+    @Autowired
+    private  TaSalesBatchMapper taSalesBatchMapper;
+
     /**
      * 添加客户分享记录
      *
@@ -107,10 +111,10 @@ public class TaSharePersonFromServiceImpl extends ServiceImpl<TaSharePersonFromM
         Page page = new Page(pageNum,pageSize);
         // 分页查询
         List<TaSharePersonFrom> list = taSharePersonFromMapper.selectHouseVisitList(page, orgId, personType, sceneType, phone, saleBatchId);
-//        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
-//        list.forEach(e -> {
-//            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
-//        });
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
+        list.forEach(e -> {
+            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+        });
         page.setRecords(list);
         return ResponseBean.success(page);
     }

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -336,6 +336,26 @@
             and t.person_id = #{personId} order by t.create_date desc limit 9999
             ) t
             group by t.target_id
+         union all
+
+        select * from (
+            select
+            t.be_share as target_id,
+            g.aerial_view_img as activity_img,
+            g.sales_batch_name as activity_name,
+            '1' as price,
+            '2' as building_name,
+            '3' as address,
+            1 as building_type_id,
+			t.tagert_type 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
+            where t.tagert_type like CONCAT('house' , '%')
+            and t.person_id = #{personId} order by t.create_date desc limit 9999
+            ) t
+            group by t.target_id
+
         ) t
         order by t.visit_time desc
     </select>

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -65,10 +65,12 @@
         t.update_date,
         t.building_id,
         t.sales_batch_id,
+        e.apartment_name,
         (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}

src/main/resources/mapper/TaShareMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareMapper">
 
     <select id="selectHouseShareList" resultType="com.huiju.estateagents.entity.TaShare">
-      select a.avatarurl as photoOravatar, a.nickname as nameOrnick, a.name, a.phone, a.person_type, t.create_date From ta_share t
+      select a.avatarurl as photoOravatar, a.nickname as nameOrnick, a.name, a.phone, a.person_type, t.tagert_type, t.create_date From ta_share t
       left join ta_person a on t.person_id = a.person_id
-      left join ta_housing_resources b on t.be_share = b.house_id
+      left join ta_sales_batch b on t.be_share = b.sales_batch_id
       where a.org_id = #{orgId}
       and t.tagert_type in ('housePost','houseApp')
       and b.sales_batch_id = #{saleBatchId}

src/main/resources/mapper/TaSharePersonFromMapper.xml

@@ -31,8 +31,10 @@
         left join td_wx_dict b on a.scene_id = b.scene_id
         left join ta_person c on t.person_id = c.person_id
         left join ta_housing_resources d on d.house_id = t.target_id
+        left join ta_sales_batch z on t.target_id = z.sales_batch_id
         where a.org_id = #{orgId}
-        and t.target_type in ('housePost','houseApp')
+        and t.target_type = 'house_share'
+        and z.sales_batch_id = #{saleBatchId}
         <if test="personType != null and personType != ''">
             and c.person_Type = #{personType}
         </if>
@@ -42,6 +44,7 @@
         <if test="phone != null and phone != ''">
             and c.phone = #{phone}
         </if>
+        and t.share_person != t.person_id
         GROUP BY t.target_id,t.target_type,t.person_id,t.share_person
         order by t.create_date desc
     </select>