Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java

@@ -162,5 +162,18 @@ public interface StaffMapper {
     List<TabHaobanStaff> listAllByPage(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("startItem") int startItem , @Param("pageSize") int pageSize);
 
     void updateOpenConcatFlag(@Param("wxUserIdList")List<String> wxUserIdList , @Param("mixFlag")int mixFlag);
+    /**
+     * 查询其他占用许可总数
+     */
+    Integer getOccupyNum();
+
+    StaffDTO getStaffInfoByWxOpenUserId(@Param("wxOpenUseId") String wxOpenUseId);
+    /**
+     * 通过wxOpenUserId更新企业成员许可信息
+     */
+    void updateStaffInfoByWxOpenUserId(@Param("wxOpenUseId") String wxOpenUseId,
+                                       @Param("activeTime")Date activeTime,
+                                       @Param("expireTime")Date expireTime,
+                                       @Param("activeCode")String activeCode);
     
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/TabHaobanStaff.java

@@ -55,6 +55,34 @@ public class TabHaobanStaff implements Serializable {
     private String departmentIds;
     private int openConcatFlag ;
 
+    private Date activeTime;
+    private Date expireTime;
+    private String activeCode;
+
+    public Date getActiveTime() {
+        return activeTime;
+    }
+
+    public void setActiveTime(Date activeTime) {
+        this.activeTime = activeTime;
+    }
+
+    public Date getExpireTime() {
+        return expireTime;
+    }
+
+    public void setExpireTime(Date expireTime) {
+        this.expireTime = expireTime;
+    }
+
+    public String getActiveCode() {
+        return activeCode;
+    }
+
+    public void setActiveCode(String activeCode) {
+        this.activeCode = activeCode;
+    }
+
     public int getOpenConcatFlag() {
         return openConcatFlag;
     }

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -26,13 +26,16 @@
         <result column="add_num" property="addNum" jdbcType="INTEGER"/>
         <result column="active_status" property="activeStatus" jdbcType="INTEGER"/>
         <result column="open_concat_flag" property="openConcatFlag"/>
+        <result column="active_time" property="activeTime" jdbcType="TIMESTAMP"/>
+        <result column="expire_time" property="expireTime" jdbcType="TIMESTAMP"/>
+        <result column="active_code" property="activeCode" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         staff_id
         , wx_user_id, phone_number, staff_name, nation_code, nick_name, sex, postion,
     active_flag, extend_postion, status_flag, create_time, update_time,wx_enterprise_id,head_img,
-    sort,sync_postion_flag,super_manager_flag,wx_open_user_id,wx_open_id,qr_code,add_num,active_status,open_concat_flag
+    sort,sync_postion_flag,super_manager_flag,wx_open_user_id,wx_open_id,qr_code,add_num,active_status,open_concat_flag,active_time,expire_time,active_code
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
@@ -570,4 +573,20 @@
     		</foreach>
     </update>
 
+    <select id="getOccupyNum" resultType="java.lang.Integer">
+        SELECT count(*) FROM tab_haoban_staff WHERE status_flag=0 and expire_time is not null
+    </select>
+
+    <select id="getStaffInfoByWxOpenUserId" resultType="com.gic.haoban.manage.api.dto.StaffDTO">
+        SELECT * FROM tab_haoban_staff WHERE wx_open_user_id = #{wxOpenUseId}
+    </select>
+
+    <update id="updateStaffInfoByWxOpenUserId">
+        update tab_haoban_staff set
+             active_time = #{activeTime},
+             expire_time = #{expireTime},
+             active_code = #{activeCode}
+        where wx_open_user_id = #{wxOpenUseId}
+    </update>
+
 </mapper>
\ No newline at end of file