From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/ActivitiesBeautifulStaffServiceDaoImplMapper.xml | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/ActivitiesBeautifulStaffServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/ActivitiesBeautifulStaffServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 0b45e69..e93112f
--- a/java110-db/src/main/resources/mapper/user/ActivitiesBeautifulStaffServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/ActivitiesBeautifulStaffServiceDaoImplMapper.xml
@@ -4,7 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="activitiesBeautifulStaffServiceDaoImpl">
-
<!-- 淇濆瓨娲诲姩瑙勫垯淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveActivitiesBeautifulStaffInfo" parameterType="Map">
insert into activities_beautiful_staff(
@@ -14,16 +13,15 @@
)
</insert>
-
<!-- 鏌ヨ娲诲姩瑙勫垯淇℃伅 add by wuxw 2018-07-03 -->
<select id="getActivitiesBeautifulStaffInfo" parameterType="Map" resultType="Map">
select t.be_id,t.be_id beId,t.work_content,t.work_content workContent,t.activities_num,t.activities_num
activitiesNum,t.status_cd,t.status_cd statusCd,t.poll,t.rule_id,t.rule_id ruleId,t.store_id,t.store_id
- storeId,t.staff_id,t.staff_id staffId,uu.name staffName,ar.rule_name ruleName
+ storeId,t.staff_id,t.staff_id staffId,uu.name staffName,ar.rule_name ruleName,t.create_time createTime
from activities_beautiful_staff t
left join u_user uu on t.staff_id = uu.user_id and uu.status_cd = '0'
- left join activities_rule ar on t.rule_id = ar.rule_id and ar.status_cd = '0' and ar.obj_type = '3307' and ar.obj_id = t.store_id;
-
+ left join activities_rule ar on t.rule_id = ar.rule_id and ar.status_cd = '0' and ar.obj_type = '3307' and
+ ar.obj_id = t.store_id
where 1 =1
<if test="beId !=null and beId != ''">
and t.be_id= #{beId}
@@ -53,9 +51,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼娲诲姩瑙勫垯淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateActivitiesBeautifulStaffInfo" parameterType="Map">
@@ -85,7 +81,6 @@
<if test="beId !=null and beId != ''">
and t.be_id= #{beId}
</if>
-
</update>
<!-- 鏌ヨ娲诲姩瑙勫垯鏁伴噺 add by wuxw 2018-07-03 -->
@@ -117,8 +112,5 @@
<if test="staffId !=null and staffId != ''">
and t.staff_id= #{staffId}
</if>
-
-
</select>
-
</mapper>
--
Gitblit v1.8.0