员工权限-范围权限

src/main/java/com/dk/mdm/controller/mst/StaffController.java

@@ -5,7 +5,7 @@ import com.dk.common.response.ResponseResultVO;
 import com.dk.common.util.ExcelUtils;
 import com.dk.mdm.model.pojo.mst.Staff; 
 import com.dk.common.service.BaseService;
-import com.dk.mdm.model.query.core.StaffQuery;
+import com.dk.mdm.model.query.mst.StaffQuery;
 import com.dk.mdm.model.response.mst.StaffResponse;
 import com.dk.mdm.model.vo.mst.StaffVO;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/dk/mdm/mapper/mst/MoneyAccountMapper.java

@@ -2,10 +2,8 @@ package com.dk.mdm.mapper.mst;
 
 import com.dk.mdm.model.pojo.mst.MoneyAccount;
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.query.core.StaffQuery;
 import com.dk.mdm.model.query.mst.MoneyAccountQuery;
 import com.dk.mdm.model.response.mst.MoneyAccountResponse;
-import com.dk.mdm.model.response.mst.StaffResponse;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

src/main/java/com/dk/mdm/mapper/mst/StaffMapper.java

@@ -2,7 +2,7 @@ package com.dk.mdm.mapper.mst;
 
 import com.dk.mdm.model.pojo.mst.Staff;
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.query.core.StaffQuery;
+import com.dk.mdm.model.query.mst.StaffQuery;
 import com.dk.mdm.model.response.mst.StaffResponse;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/dk/mdm/mapper/mst/StaffMapper.xml

@@ -7,7 +7,7 @@
     <sql id="Base_Column_List">
         t.staff_id
         , t.staff_code, t.staff_name,t.staff_phone, t.org_id, t.role_ids,  t.wx_user_id, t.remarks,
-        t.flg_valid,t.flg_can_login,
+        t.flg_valid,t.flg_can_login,t.hr_status,
         t.cp_id, t.op_create_time, t.op_create_user_id, t.op_update_time, t.op_update_user_id
     </sql>
 
@@ -19,6 +19,7 @@
         <result column="staff_phone" property="staffPhone"/>
         <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
         <result column="org_name" property="orgName"/>
+        <result column="role_names" property="roleNames"/>
         <result column="role_ids" property="roleIds" typeHandler="UuidListTypeHandler"/>
         <result column="wx_user_id" property="wxUserId" typeHandler="UuidTypeHandler"/>
         <result column="remarks" property="remarks"/>
@@ -32,6 +33,7 @@
         <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
         <result column="op_db_user" property="opDbUser"/>
         <result column="flg_can_login" property="flgCanLogin"/>
+        <result column="hr_status" property="hrStatus"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -62,7 +64,9 @@
             <if test="cpId != null">
                 AND t.cp_id = #{cpId}
             </if>
-
+            <if test="hrStatus != null">
+                AND t.hr_status = #{hrStatus}
+            </if>
             <if test="roleIds != null and roleIds.size()>0">
                 AND t.role_ids =
                 any(#{roleIds, typeHandler=StringListTypeHandler})
@@ -74,29 +78,12 @@
         </where>
     </sql>
 
-    <!-- 根据主键修改 -->
-<!--    <update id="update">-->
-<!--        update dkic_b.t_mst_staff-->
-<!--         <set>-->
-<!--            <if test="staffCode != null">staff_code = #{staffCode},</if>-->
-<!--            <if test="staffName != null" >staff_name = #{staffName},</if>-->
-<!--            <if test="staffPhone != null">staff_phone = #{staffPhone},</if>-->
-<!--            <if test="orgId != null">org_id = #{orgId},</if>-->
-<!--            <if test="roleIds != null">role_ids = #{roleIds},</if>-->
-<!--            <if test="remarks != null">remarks = #{remarks},</if>-->
-<!--            <if test="flgCanLogin != null">flg_can_login = #{flgCanLogin},</if>-->
-<!--            <if test="updateUserId != null">update_user_id = #{updateUserId},</if>-->
-<!--            <if test="updateUserName != null">update_user_name = #{updateUserName},</if>-->
-<!--            <if test="updateTime != null">update_time = #{updateTime},</if>-->
-<!--         </set>-->
-<!--        where staff_id = #{staffId}::uuid-->
-<!--    </update>-->
-
     <!-- 查询表t_mst_staff，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
         , org.org_name
+
         FROM dkic_b.t_mst_staff t
         LEFT JOIN dkic_b.t_mst_org org
         ON t.org_Id = org.org_Id
@@ -126,9 +113,6 @@
         WHERE t.staff_id = #{staffId}::uuid
     </select>
 
-
-
-
     <insert id="insertBatch">
         insert into dkic_b.t_mst_staff
         (

src/main/java/com/dk/mdm/model/pojo/mst/Staff.java

@@ -193,6 +193,13 @@ public class Staff extends PageInfo<Staff> implements Serializable {
     private Boolean flgCanLogin;
 
 
+    /**
+     * 登录标识1能登录 0不能登录
+     */
+    @Excel(name = "登录标识")
+    @ApiModelProperty(value = "登录标识")
+    private Integer hrStatus;
+
     /*
      * 相关属性
      * @TableField(exist = false)

src/main/java/com/dk/mdm/model/query/core/StaffQuery.java → src/main/java/com/dk/mdm/model/query/mst/StaffQuery.java

@@ -1,4 +1,4 @@
-package com.dk.mdm.model.query.core;
+package com.dk.mdm.model.query.mst;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -231,6 +231,13 @@ public class StaffQuery extends PageInfo<StaffQuery> implements Serializable {
     @ApiModelProperty(value = "组织部门list")
     private List<Integer> orgIds;
 
+    /**
+     * 登录标识1能登录 0不能登录
+     */
+    @Excel(name = "登录标识")
+    @ApiModelProperty(value = "登录标识")
+    private Integer hrStatus;
+
     private String searchText;
 
     private static final long serialVersionUID = 1L;

src/main/java/com/dk/mdm/model/response/mst/StaffResponse.java

@@ -110,10 +110,16 @@ public class StaffResponse extends PageInfo<StaffResponse> implements Serializab
     /**
      * @desc   : 角色list
      */
-    @ApiModelProperty(value = "员工状态list")
+    @ApiModelProperty(value = "角色list")
     @TableField(typeHandler = UuidListTypeHandler.class)
     private List<String> roleIds;
 
+    /**
+     * @desc   : 角色
+     */
+    @ApiModelProperty(value = "员工角色名称")
+    private String roleNames;
+
 
     /**
      * 企业ID
@@ -122,6 +128,13 @@ public class StaffResponse extends PageInfo<StaffResponse> implements Serializab
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 
+    /**
+     * 登录标识1能登录 0不能登录
+     */
+    @Excel(name = "登录标识")
+    @ApiModelProperty(value = "登录标识")
+    private Integer hrStatus;
+
 
     /**
      * 创建时间 (触发器自动处理)
@@ -193,25 +206,6 @@ public class StaffResponse extends PageInfo<StaffResponse> implements Serializab
     @ApiModelProperty(value = "关联工号ID")
     private List<Integer> userIds;
 
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-    /**
-     * 工种名称
-     */
-    @Excel(name = "工种名称")
-    @ApiModelProperty(value = "工种名称")
-    private String jobName;
-
-    /**
-     * 职务名称
-     */
-    @Excel(name = "职务名称")
-    @ApiModelProperty(value = "职务名称")
-    private String postName;
-
     /**
      * 组织部门名称
      */

src/main/java/com/dk/mdm/model/vo/mst/StaffVO.java

@@ -112,7 +112,12 @@ public class StaffVO extends PageInfo<StaffVO> implements Serializable {
      */
     @ApiModelProperty(value = "工厂ID")
     private Integer cpId;
-
+    /**
+     * 登录标识1能登录 0不能登录
+     */
+    @Excel(name = "登录标识")
+    @ApiModelProperty(value = "登录标识")
+    private Integer hrStatus;
 
 
     /**

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -11,10 +11,8 @@ import com.dk.mdm.model.pojo.mst.*;
 import com.dk.mdm.mapper.mst.StaffMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
-import com.dk.mdm.model.query.core.StaffQuery;
-import com.dk.mdm.model.query.mst.RoleQuery;
+import com.dk.mdm.model.query.mst.StaffQuery;
 import com.dk.mdm.model.response.mst.StaffResponse;
-import com.dk.mdm.model.vo.mst.RoleVo;
 import com.dk.mdm.model.vo.mst.StaffVO;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;