From cca9b37d15cefe705d03219e2be1f73d77ee7254 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 11 七月 2025 11:29:53 +0800 Subject: [PATCH] docker compose --- framework/src/main/resources/mapper/lmk/ActivityMapper.xml | 87 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 3 deletions(-) diff --git a/framework/src/main/resources/mapper/lmk/ActivityMapper.xml b/framework/src/main/resources/mapper/lmk/ActivityMapper.xml index 68c6209..4d7b1aa 100644 --- a/framework/src/main/resources/mapper/lmk/ActivityMapper.xml +++ b/framework/src/main/resources/mapper/lmk/ActivityMapper.xml @@ -18,11 +18,49 @@ <result column="limit_user_num" property="limitUserNum" /> <result column="activity_location" property="activityLocation" /> <result column="activity_content" property="activityContent" /> + <result column="publish" property="publish" /> + </resultMap> + + <resultMap id="MyActivityResultMap" type="cn.lili.modules.lmk.domain.vo.MyActivityVo"> + <result column="activity_name" property="activityName" /> + <result column="activity_type" property="activityType"/> + <result column="end_time" property="endTime" /> + <result column="status" property="status" /> + <result column="cover" property="cover" /> + <result column="cover_type" property="coverType" /> + <result column="activity_location" property="activityLocation" /> + <result column="cancel" property="cancel"/> + <result column="activity_report_id" property="activityReportId"/> </resultMap> - + <select id="getMyActivityList" resultMap="MyActivityResultMap"> + SELECT + LA.id, + LA.activity_name, + LA.activity_type, + LA.start_time, + LA.end_time, + LA.status, + LA.cover, + LA.cover_type, + LA.activity_location, + LAR.cancel, + LA.id as activity_report_id + FROM lmk_activity_report LAR + LEFT JOIN lmk_activity LA ON LAR.activity_id = LA.id + where LA.delete_flag = 0 + AND LAR.delete_flag = 0 + AND LAR.user_id = #{userId} + AND LAR.cancel = #{query.cancel} + <if test="query.status == null or query.status == ''"> + AND LA.status != 'end' + </if> + <if test="query.status != null and query.status != ''"> + AND LA.status = #{query.status} + </if> + </select> @@ -41,7 +79,8 @@ LA.cover_type, LA.limit_user_num, LA.activity_location, - LA.activity_content + LA.activity_content, + LA.publish FROM lmk_activity LA WHERE @@ -64,7 +103,8 @@ LA.cover_type, LA.limit_user_num, LA.activity_location, - LA.activity_content + LA.activity_content, + LA.publish FROM lmk_activity LA WHERE @@ -75,6 +115,32 @@ <if test="query.reportStartTime != null">AND LA.report_start_time >= #{query.reportStartTime}</if> <if test="query.reportEndTime != null">AND LA.report_end_time <= #{query.reportEndTime}</if> </select> + + <select id="getCanReportPage" resultMap="BaseResultMap"> + SELECT + LA.id, + LA.activity_name, + LA.activity_type, + LA.report_start_time, + LA.report_end_time, + LA.start_time, + LA.end_time, + LA.status, + LA.recommend, + LA.cover, + LA.cover_type, + LA.limit_user_num, + LA.activity_location, + LA.activity_content + FROM + lmk_activity LA + WHERE + LA.delete_flag = 0 + AND LA.publish = 1 + </select> + + + <resultMap id="memberMap" type="cn.lili.modules.member.entity.vo.MemberVO"> <id property="id" column="id"/> @@ -107,4 +173,19 @@ WHERE LAR.activity_id = #{query.id} </select> + <update id="batchUpdateActivities"> + UPDATE lmk_activity + <trim prefix="SET" suffixOverrides=","> + <trim prefix="status = CASE id" suffix="END,"> + <foreach collection="list" item="item"> + WHEN #{item.id} THEN #{item.status} + </foreach> + </trim> + </trim> + WHERE id IN + <foreach collection="list" item="item" open="(" separator="," close=")"> + #{item.id} + </foreach> + </update> + </mapper> -- Gitblit v1.8.0