From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-db/src/main/resources/mapper/user/ActivitiesBeautifulStaffServiceDaoImplMapper.xml |  201 ++++++++++++++++++++++++-------------------------
 1 files changed, 98 insertions(+), 103 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 0016ae5..f72fd29
--- a/java110-db/src/main/resources/mapper/user/ActivitiesBeautifulStaffServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/ActivitiesBeautifulStaffServiceDaoImplMapper.xml
@@ -4,121 +4,116 @@
         "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(
-be_id,work_content,activities_num,poll,rule_id,store_id,staff_id
-) values (
-#{beId},#{workContent},#{activitiesNum},#{poll},#{ruleId},#{storeId},#{staffId}
-)
+        be_id,work_content,activities_num,poll,rule_id,store_id,staff_id
+        ) values (
+        #{beId},#{workContent},#{activitiesNum},#{poll},#{ruleId},#{storeId},#{staffId}
+        )
     </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 
-from activities_beautiful_staff t 
-where 1 =1 
-<if test="beId !=null and beId != ''">
-   and t.be_id= #{beId}
-</if> 
-<if test="workContent !=null and workContent != ''">
-   and t.work_content= #{workContent}
-</if> 
-<if test="activitiesNum !=null and activitiesNum != ''">
-   and t.activities_num= #{activitiesNum}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="poll !=null and poll != ''">
-   and t.poll= #{poll}
-</if> 
-<if test="ruleId !=null and ruleId != ''">
-   and t.rule_id= #{ruleId}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
-
+        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,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
+        where 1 =1
+        <if test="beId !=null and beId != ''">
+            and t.be_id= #{beId}
+        </if>
+        <if test="workContent !=null and workContent != ''">
+            and t.work_content= #{workContent}
+        </if>
+        <if test="activitiesNum !=null and activitiesNum != ''">
+            and t.activities_num= #{activitiesNum}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="poll !=null and poll != ''">
+            and t.poll= #{poll}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+        <if test="staffName !=null and staffName != ''">
+            and uu.name like '%${staffName}%'
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
     </select>
-
-
-
 
     <!-- 淇敼娲诲姩瑙勫垯淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateActivitiesBeautifulStaffInfo" parameterType="Map">
-        update  activities_beautiful_staff t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="workContent !=null and workContent != ''">
-, t.work_content= #{workContent}
-</if> 
-<if test="activitiesNum !=null and activitiesNum != ''">
-, t.activities_num= #{activitiesNum}
-</if> 
-<if test="poll !=null and poll != ''">
-, t.poll= #{poll}
-</if> 
-<if test="ruleId !=null and ruleId != ''">
-, t.rule_id= #{ruleId}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-, t.staff_id= #{staffId}
-</if> 
- where 1=1 <if test="beId !=null and beId != ''">
-and t.be_id= #{beId}
-</if> 
-
+        update activities_beautiful_staff t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="workContent !=null and workContent != ''">
+            , t.work_content= #{workContent}
+        </if>
+        <if test="activitiesNum !=null and activitiesNum != ''">
+            , t.activities_num= #{activitiesNum}
+        </if>
+        <if test="poll !=null and poll != ''">
+            , t.poll= #{poll}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            , t.rule_id= #{ruleId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            , t.store_id= #{storeId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            , t.staff_id= #{staffId}
+        </if>
+        where 1=1
+        <if test="beId !=null and beId != ''">
+            and t.be_id= #{beId}
+        </if>
     </update>
 
     <!-- 鏌ヨ娲诲姩瑙勫垯鏁伴噺 add by wuxw 2018-07-03 -->
-     <select id="queryActivitiesBeautifulStaffsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from activities_beautiful_staff t 
-where 1 =1 
-<if test="beId !=null and beId != ''">
-   and t.be_id= #{beId}
-</if> 
-<if test="workContent !=null and workContent != ''">
-   and t.work_content= #{workContent}
-</if> 
-<if test="activitiesNum !=null and activitiesNum != ''">
-   and t.activities_num= #{activitiesNum}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="poll !=null and poll != ''">
-   and t.poll= #{poll}
-</if> 
-<if test="ruleId !=null and ruleId != ''">
-   and t.rule_id= #{ruleId}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="staffId !=null and staffId != ''">
-   and t.staff_id= #{staffId}
-</if> 
-
-
-     </select>
-
+    <select id="queryActivitiesBeautifulStaffsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from activities_beautiful_staff t
+        where 1 =1
+        <if test="beId !=null and beId != ''">
+            and t.be_id= #{beId}
+        </if>
+        <if test="workContent !=null and workContent != ''">
+            and t.work_content= #{workContent}
+        </if>
+        <if test="activitiesNum !=null and activitiesNum != ''">
+            and t.activities_num= #{activitiesNum}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="poll !=null and poll != ''">
+            and t.poll= #{poll}
+        </if>
+        <if test="ruleId !=null and ruleId != ''">
+            and t.rule_id= #{ruleId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="staffId !=null and staffId != ''">
+            and t.staff_id= #{staffId}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.8.0