首页接口

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

             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
-            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
+//            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
 

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

      * type(1助力，2拼团)
      */
     @TableField(exist = false)
-    private Integer type;
+    private String type;
 }

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

     @TableField(exist = false)
     private String activityName;
 
+    /**
+     * 资讯名称
+     */
+    @TableField(exist = false)
+    private String newsName;
+
+    /**
+     * 助力名称
+     */
+    @TableField(exist = false)
+    private String helpActivityName;
+
+    /**
+     * 拼团名称
+     */
+    @TableField(exist = false)
+    private String groupActivityName;
+
+    /**
+     * H5名称
+     */
+    @TableField(exist = false)
+    private String drainageName;
+
     /**
      * 分享者名称
      */

src/main/resources/mapper/HelpActivityMapper.xml

 				a.help_activity_id as activityId,
 				a.img as img,
                 a.banner_list_img as bannerListImg,
-				1 AS type
+                a.title as title,
+                a.end_date as endDate,
+                a.`status` as status,
+				"help" AS type
 			FROM
 				ta_help_activity a
 				WHERE
 					s.group_activity_id as activityId,
 					s.main_img as img,
                     s.banner_list_img as bannerListImg,
-					2 AS type
+                    s.activity_name as title,
+                    s.end_time as endDate,
+                    s.status as status,
+					"group" AS type
 				FROM
 					ta_share_activity s
 					WHERE
                     and s.building_id = #{buildingId}
                 </if>
 			)
+		UNION ALL
+		    (
+                SELECT
+                t.city_id as cityId,
+                t.dynamic_id as activityId,
+                t.img_url as img,
+                t.banner_list_img as bannerListImg,
+                t.title as title,
+                t.end_date as endDate,
+                t.status as status,
+                "activity" AS type
+                FROM
+                ta_building_dynamic t
+                WHERE
+                t.org_id =#{orgId} and t.`status` = 1
+                <if test="buildingId  == null or  buildingId =='' ">
+                    and  t.home = 1
+                </if>
+                <if test="cityID != null and cityID != ''">
+                    and  t.city_id = #{cityID}
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                    and t.building_id = #{buildingId}
+                </if>
+            )
     </select>
 
     <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

         select * from (
             select
             <include refid="columnSql"></include>,
-            b.name as activityName,
+            b.name as drainageName,
+            d.building_name as buildingName,
+            tn.news_name as newsName,
+            tha.title as helpActivityName,
+            tsa.activity_name as groupActivityName,
+            tbd.title as activityName,
             b.drainage_id
             from ta_person_visit_record t
             left join ta_drainage b on t.target_id = b.drainage_id
-            left join ta_person c on t.share_person_id = c.person_id
             left join ta_building d on t.target_id = d.building_id
+            left join ta_news tn on t.target_id = tn.news_id
+            left join ta_help_activity tha on t.target_id = tha.help_activity_id
+            left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
+            left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
+            left join ta_person c on t.share_person_id = c.person_id
             where
             t.share_person_id is not null
             <if test="orgId != null and orgId != ''">