角色员工

java110-bean/src/main/java/com/java110/dto/privilegeUser/PrivilegeUserDto.java

@@ -21,6 +21,7 @@ public class PrivilegeUserDto extends PageDto implements Serializable {
     private String pId;
     private String storeId;
     private String userId;
+    private String userName;
 
 
     private Date createTime;
@@ -85,4 +86,12 @@ public class PrivilegeUserDto extends PageDto implements Serializable {
     public void setpId(String pId) {
         this.pId = pId;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 }

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

@@ -115,12 +115,16 @@
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
+
         <if test="storeId !=null and storeId != ''">
             and t.store_id= #{storeId}
         </if>
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>
+        <if test="userName !=null and userName != ''">
+            and uu.name like concat('%', #{userName},'%')
+        </if>
     </select>
 
     <!-- 查询用户权限信息 add by wuxw 2018-07-03 -->
@@ -150,12 +154,49 @@
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>
+        <if test="userName !=null and userName != ''">
+            and uu.name like concat('%', #{userName},'%')
+        </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 -->
+    <select id="queryStaffsNoRoleCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from u_user t
+        inner join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'
+        left join p_privilege_user pu on t.user_id = pu.user_id and pu.status_cd = '0' and pu.privilege_flag = '1' and pu.p_id = #{pId}
+        where t.status_cd = '0'
+        and pu.pu_id is null
+        <if test="userName !=null and userName != ''">
+            and t.name like concat('%', #{userName},'%')
+        </if>
+        and su.store_id = #{storeId}
+    </select>
 
+    <!-- 查询用户权限信息 add by wuxw 2018-07-03 -->
+    <select id="queryStaffsNoRoleInfos" parameterType="Map" resultType="Map">
+        select
+        t.user_id,t.user_id userId,
+        t.address,t.sex,t.user_id,t.user_id userId,t.level_cd,t.level_cd
+        levelCd,t.location_cd,t.location_cd locationCd,t.score,t.name,t.tel,t.email,t.age
+        from u_user t
+        inner join s_store_user su on t.user_id = su.user_id and su.status_cd = '0'
+        left join p_privilege_user pu on t.user_id = pu.user_id and pu.status_cd = '0' and pu.privilege_flag = '1' and pu.p_id = #{pId}
+        where t.status_cd = '0'
+        and pu.pu_id is null
+        <if test="userName !=null and userName != ''">
+            and t.name like concat('%', #{userName},'%')
+        </if>
+        and su.store_id = #{storeId}
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
 
 </mapper>

java110-interface/src/main/java/com/java110/intf/user/IPrivilegeUserV1InnerServiceSMO.java

@@ -71,4 +71,10 @@ public interface IPrivilegeUserV1InnerServiceSMO {
 
     @RequestMapping(value = "/queryPrivilegeUserInfos", method = RequestMethod.POST)
     List<UserDto> queryPrivilegeUserInfos(@RequestBody PrivilegeUserDto privilegeUserDto);
+
+    @RequestMapping(value = "/queryStaffsNoRoleCount", method = RequestMethod.POST)
+    int queryStaffsNoRoleCount(@RequestBody PrivilegeUserDto privilegeUserDto);
+
+    @RequestMapping(value = "/queryStaffsNoRoleInfos", method = RequestMethod.POST)
+    List<UserDto> queryStaffsNoRoleInfos(@RequestBody PrivilegeUserDto privilegeUserDto);
 }

service-user/src/main/java/com/java110/user/cmd/role/ListStaffsNoRoleCmd.java

@@ -1,4 +1,60 @@
 package com.java110.user.cmd.role;
 
-public class ListStaffsNoRoleCmd {
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.privilegeUser.PrivilegeUserDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.user.IPrivilegeUserV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 查询不在这个角色 内的员工
+ */
+@Java110Cmd(serviceCode = "role.listStaffsNoRole")
+public class ListStaffsNoRoleCmd extends Cmd {
+
+    @Autowired
+    private IPrivilegeUserV1InnerServiceSMO privilegeUserV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        Assert.hasKeyAndValue(reqJson, "roleId", "未包含角色");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
+        String storeId = context.getReqHeaders().get("store-id");
+
+        PrivilegeUserDto privilegeUserDto = new PrivilegeUserDto();
+        privilegeUserDto.setpId(reqJson.getString("roleId"));
+        privilegeUserDto.setStoreId(storeId);
+        privilegeUserDto.setPrivilegeFlag(PrivilegeUserDto.PRIVILEGE_FLAG_GROUP);
+
+        int count = privilegeUserV1InnerServiceSMOImpl.queryStaffsNoRoleCount(privilegeUserDto);
+
+        List<UserDto> staffsDtos = null;
+
+        if (count > 0) {
+            staffsDtos = privilegeUserV1InnerServiceSMOImpl.queryStaffsNoRoleInfos(privilegeUserDto);
+        } else {
+            staffsDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, staffsDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        context.setResponseEntity(responseEntity);
+    }
 }

service-user/src/main/java/com/java110/user/dao/IPrivilegeUserV1ServiceDao.java

@@ -77,4 +77,8 @@ public interface IPrivilegeUserV1ServiceDao {
     List<Map> queryPrivilegeUserInfos(Map info);
 
     int queryPrivilegeUserInfoCount(Map info);
+
+    int queryStaffsNoRoleCount(Map info);
+
+    List<Map> queryStaffsNoRoleInfos(Map info);
 }

service-user/src/main/java/com/java110/user/dao/impl/PrivilegeUserV1ServiceDaoImpl.java

@@ -129,5 +129,26 @@ public class PrivilegeUserV1ServiceDaoImpl extends BaseServiceDao implements IPr
         return Integer.parseInt(businessPrivilegeUserInfos.get(0).get("count").toString());
     }
 
+    @Override
+    public int queryStaffsNoRoleCount(Map info) {
+        logger.debug("查询 queryStaffsNoRoleCount 入参 info : {}",info);
+
+        List<Map> businessPrivilegeUserInfos = sqlSessionTemplate.selectList("privilegeUserV1ServiceDaoImpl.queryStaffsNoRoleCount", info);
+        if (businessPrivilegeUserInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessPrivilegeUserInfos.get(0).get("count").toString());
+    }
+
+    @Override
+    public List<Map> queryStaffsNoRoleInfos(Map info) {
+        logger.debug("查询 queryStaffsNoRoleInfos 入参 info : {}",info);
+
+        List<Map> businessPrivilegeUserInfos = sqlSessionTemplate.selectList("privilegeUserV1ServiceDaoImpl.queryStaffsNoRoleInfos",info);
+
+        return businessPrivilegeUserInfos;
+    }
+
 
 }

service-user/src/main/java/com/java110/user/smo/impl/PrivilegeUserV1InnerServiceSMOImpl.java

@@ -106,4 +106,24 @@ public class PrivilegeUserV1InnerServiceSMOImpl extends BaseServiceSMO implement
         return privilegeUsers;
     }
 
+    @Override
+    public int queryStaffsNoRoleCount(@RequestBody PrivilegeUserDto privilegeUserDto) {
+        return privilegeUserV1ServiceDaoImpl.queryStaffsNoRoleCount(BeanConvertUtil.beanCovertMap(privilegeUserDto));
+    }
+
+    @Override
+    public List<UserDto> queryStaffsNoRoleInfos(@RequestBody PrivilegeUserDto privilegeUserDto) {
+        //校验是否传了 分页信息
+
+        int page = privilegeUserDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            privilegeUserDto.setPage((page - 1) * privilegeUserDto.getRow());
+        }
+
+        List<UserDto> privilegeUsers = BeanConvertUtil.covertBeanList(privilegeUserV1ServiceDaoImpl.queryStaffsNoRoleInfos(BeanConvertUtil.beanCovertMap(privilegeUserDto)), UserDto.class);
+
+        return privilegeUsers;
+    }
+
 }