|
|
@@ -138,21 +138,17 @@
|
|
|
statusCd,t.title,t.read_count,t.read_count readCount,t.user_name,t.user_name userName,t.user_id,t.user_id
|
|
|
userId,t.activities_id,t.activities_id activitiesId,t.type_cd,t.type_cd
|
|
|
typeCd,t.context,t.start_time,t.start_time startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id
|
|
|
- communityId,t.b_id,t.b_id bId,t.header_img,t.header_img headerImg,t.state,td1.name typeCdName,t.create_time createTime
|
|
|
- from activities t,t_dict td1
|
|
|
+ communityId,t.b_id,t.b_id bId,t.header_img,t.header_img headerImg,t.state,act.type_name typeCdName,t.create_time createTime
|
|
|
+ from activities t
|
|
|
+ left join activities_type act on t.type_cd = act.type_cd and act.status_cd = '0' and t.community_id = act.community_id
|
|
|
where 1 =1
|
|
|
- and t.type_cd = td1.status_cd
|
|
|
- and td1.table_name = 'activities'
|
|
|
- and td1.table_columns = 'type_cd'
|
|
|
+ and t.status_cd= '0'
|
|
|
<if test="collectCount !=null and collectCount != ''">
|
|
|
and t.collect_count= #{collectCount}
|
|
|
</if>
|
|
|
<if test="likeCount !=null and likeCount != ''">
|
|
|
and t.like_count= #{likeCount}
|
|
|
</if>
|
|
|
- <if test="statusCd !=null and statusCd != ''">
|
|
|
- and t.status_cd= #{statusCd}
|
|
|
- </if>
|
|
|
<if test="title !=null and title != ''">
|
|
|
and t.title= #{title}
|
|
|
</if>
|
|
|
@@ -260,15 +256,14 @@
|
|
|
select count(1) count
|
|
|
from activities t
|
|
|
where 1 =1
|
|
|
+ and t.status_cd= '0'
|
|
|
<if test="collectCount !=null and collectCount != ''">
|
|
|
and t.collect_count= #{collectCount}
|
|
|
</if>
|
|
|
<if test="likeCount !=null and likeCount != ''">
|
|
|
and t.like_count= #{likeCount}
|
|
|
</if>
|
|
|
- <if test="statusCd !=null and statusCd != ''">
|
|
|
- and t.status_cd= #{statusCd}
|
|
|
- </if>
|
|
|
+
|
|
|
<if test="title !=null and title != ''">
|
|
|
and t.title= #{title}
|
|
|
</if>
|