From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml | 78 +++++++++++++++-----------------------
1 files changed, 31 insertions(+), 47 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index be4425e..a6818ea
--- a/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/ActivitiesServiceDaoImplMapper.xml
@@ -1,19 +1,17 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="activitiesServiceDaoImpl">
<!-- 淇濆瓨娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessActivitiesInfo" parameterType="Map">
- insert into business_activities(
- collect_count,like_count,title,read_count,user_name,user_id,activities_id,operate,type_cd,context,start_time,end_time,community_id,b_id,header_img,state
- ) values (
- #{collectCount},#{likeCount},#{title},#{readCount},#{userName},#{userId},#{activitiesId},#{operate},#{typeCd},#{context},#{startTime},#{endTime},
- #{communityId},#{bId},#{headerImg},#{state}
- )
+ insert into business_activities(collect_count, like_count, title, read_count, user_name, user_id, activities_id,
+ operate, type_cd, context, start_time, end_time, community_id, b_id, header_img,
+ state)
+ values (#{collectCount}, #{likeCount}, #{title}, #{readCount}, #{userName}, #{userId}, #{activitiesId},
+ #{operate}, #{typeCd}, #{context}, #{startTime}, #{endTime},
+ #{communityId}, #{bId}, #{headerImg}, #{state})
</insert>
-
<!-- 鏌ヨ娲诲姩淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessActivitiesInfo" parameterType="Map" resultType="Map">
@@ -72,9 +70,7 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
-
</select>
-
<!-- 淇濆瓨娲诲姩淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveActivitiesInfoInstance" parameterType="Map">
@@ -128,43 +124,42 @@
<if test="headerImg !=null and headerImg != ''">
and t.header_img= #{headerImg}
</if>
-
</insert>
+ <!-- 鏌ヨ娲诲姩淇℃伅 add by wuxw 2018-07-03
- <!-- 鏌ヨ娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
+ -->
<select id="getActivitiesInfo" parameterType="Map" resultType="Map">
select t.collect_count,t.collect_count collectCount,t.like_count,t.like_count likeCount,t.status_cd,t.status_cd
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
- from activities t,t_dict td1
+ typeCd,
+ <if test="activitiesId !=null and activitiesId != ''">
+ t.context,
+ </if>
+ 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,act.type_name typeCdName,t.create_time
+ createTime
+ from activities t
+ left join activities_type act on t.type_cd = act.type_cd 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' and act.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}
+ and t.title like '%${title}%'
</if>
<if test="readCount !=null and readCount != ''">
and t.read_count= #{readCount}
</if>
- <if test="userName !=null and userName != ''">
- and t.user_name= #{userName}
+ <if test="staffName !=null and staffName != ''">
+ and t.user_name= #{staffName}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
+
<if test="activitiesId !=null and activitiesId != ''">
and t.activities_id= #{activitiesId}
</if>
@@ -175,10 +170,10 @@
and t.context= #{context}
</if>
<if test="startTime !=null ">
- and t.start_time= #{startTime}
+ and t.start_time <= #{startTime}
</if>
<if test="endTime !=null ">
- and t.end_time= #{endTime}
+ and t.end_time >= #{endTime}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -196,9 +191,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼娲诲姩淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateActivitiesInfoInstance" parameterType="Map">
@@ -252,7 +245,6 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
-
</update>
<!-- 鏌ヨ娲诲姩鏁伴噺 add by wuxw 2018-07-03 -->
@@ -260,26 +252,21 @@
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}
+ and t.title like '%${title}%'
</if>
<if test="readCount !=null and readCount != ''">
and t.read_count= #{readCount}
</if>
- <if test="userName !=null and userName != ''">
- and t.user_name= #{userName}
- </if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="staffName !=null and staffName != ''">
+ and t.user_name= #{staffName}
</if>
<if test="activitiesId !=null and activitiesId != ''">
and t.activities_id= #{activitiesId}
@@ -291,10 +278,10 @@
and t.context= #{context}
</if>
<if test="startTime !=null ">
- and t.start_time= #{startTime}
+ and t.start_time <= #{startTime}
</if>
<if test="endTime !=null ">
- and t.end_time= #{endTime}
+ and t.end_time >= #{endTime}
</if>
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
@@ -308,8 +295,5 @@
<if test="state !=null and state != ''">
and t.state= #{state}
</if>
-
-
</select>
-
</mapper>
--
Gitblit v1.8.0