加入最美员工名称 和 规则名称

java110-bean/src/main/java/com/java110/dto/activitiesBeautifulStaff/ActivitiesBeautifulStaffDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.activitiesBeautifulStaff;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,14 @@ import java.util.Date;
 public class ActivitiesBeautifulStaffDto extends PageDto implements Serializable {
 
     private String beId;
-private String workContent;
-private String activitiesNum;
-private String poll;
-private String ruleId;
-private String storeId;
-private String staffId;
+    private String workContent;
+    private String activitiesNum;
+    private String poll;
+    private String ruleId;
+    private String ruleName;
+    private String storeId;
+    private String staffId;
+    private String staffName;
 
 
     private Date createTime;
@@ -31,43 +34,56 @@ private String staffId;
     public String getBeId() {
         return beId;
     }
-public void setBeId(String beId) {
+
+    public void setBeId(String beId) {
         this.beId = beId;
     }
-public String getWorkContent() {
+
+    public String getWorkContent() {
         return workContent;
     }
-public void setWorkContent(String workContent) {
+
+    public void setWorkContent(String workContent) {
         this.workContent = workContent;
     }
-public String getActivitiesNum() {
+
+    public String getActivitiesNum() {
         return activitiesNum;
     }
-public void setActivitiesNum(String activitiesNum) {
+
+    public void setActivitiesNum(String activitiesNum) {
         this.activitiesNum = activitiesNum;
     }
-public String getPoll() {
+
+    public String getPoll() {
         return poll;
     }
-public void setPoll(String poll) {
+
+    public void setPoll(String poll) {
         this.poll = poll;
     }
-public String getRuleId() {
+
+    public String getRuleId() {
         return ruleId;
     }
-public void setRuleId(String ruleId) {
+
+    public void setRuleId(String ruleId) {
         this.ruleId = ruleId;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getStaffId() {
+
+    public String getStaffId() {
         return staffId;
     }
-public void setStaffId(String staffId) {
+
+    public void setStaffId(String staffId) {
         this.staffId = staffId;
     }
 
@@ -87,4 +103,20 @@ public void setStaffId(String staffId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getRuleName() {
+        return ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+        this.ruleName = ruleName;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
 }

java110-db/src/main/resources/mapper/user/ActivitiesBeautifulStaffServiceDaoImplMapper.xml

@@ -5,120 +5,120 @@
 <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
+        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>
+        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 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>
 
 </mapper>