Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

notes-pas/src/main/java/com/zjty/tynotes/pas/dao/PasUserDao.java

@@ -74,7 +74,11 @@ public interface PasUserDao extends MongoRepository<User, String> {
      */
     List<User> findAllByUsername(String name);
 
-
-
+    /**
+     * 根据用户状态查询用户
+     * @param status
+     * @return
+     */
+    List<User> findAllByStatus(String status);
 
 }

notes-pas/src/main/java/com/zjty/tynotes/pas/entity/User.java

@@ -81,7 +81,7 @@ public class User implements UserDetails, Serializable {
     @ApiModelProperty(value = "密码",example = "password")
     private String password;
 
-    @ApiModelProperty(value = "人员状态",example = "1")
+    @ApiModelProperty(value = "人员状态0空闲1正常2忙碌",example = "1")
     private String status;
 
     @ApiModelProperty(value = "任务数量",example = "2")

notes-pas/src/main/java/com/zjty/tynotes/pas/entity/vo/PageRequest.java

@@ -40,6 +40,11 @@ public class PageRequest {
      */
     private String deId;
 
+    /**
+     * 查询条件:人员状态
+     */
+    private String status;
+
     /**
      * 查询条件:任务数量升降序(默认降序0  1升序)
      */

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -85,7 +85,13 @@ public class UserManageServiceImpl implements UserManageService {
         List<UserVo> userVos = new ArrayList<>();
         PageResponse<UserVo> pageResponse = new PageResponse();
         String deId = pageRequest.getDeId();
-        List<User> users = pasUserDao.findAll();
+        List<User> users = null;
+        if(pageRequest.getStatus()!=null){
+            String status = pageRequest.getStatus();
+            users = pasUserDao.findAllByStatus(status);
+        }else{
+            users = pasUserDao.findAll();
+        }
         List<User> userList = new ArrayList<>();
         if(users!=null){
             for (User user : users) {
@@ -161,58 +167,6 @@ public class UserManageServiceImpl implements UserManageService {
             return pageResponse;
         }
 
-//        List<User> users = new ArrayList<>();
-//        PageResponse<UserVo> pageResponse = new PageResponse<>();
-//        pageResponse.setCurrentPage(pageRequest.getCurrentPage());
-//        pageResponse.setPageSize(pageRequest.getPageSize());
-//        if(pageRequest.getDeId()!=null){
-//            users = pasUserDao.findAllByDepartmentId(pageRequest.getId());
-//        }else{
-//            List<Department> departmentList = findDepartmentList(pageRequest.getId());
-//            List<String> departmentIds = new ArrayList<>();
-//            for (Department department : departmentList) {
-//                departmentIds.add(department.getId());
-//            }
-//            users = pasUserDao.findAllByDepartmentIdIn(departmentIds);
-//        }
-//        List<String> userIds = new ArrayList<>();
-//        for (User user : users) {
-//            userIds.add(user.getId());
-//        }
-//        List<Personnel> personnels = internalService.personnels(userIds);
-//        List<UserVo> userVos = new ArrayList<>();
-//        for (User user : users) {
-//            for (Personnel personnel : personnels) {
-//                if(user.getId().equals(personnel.getId())){
-//                    UserVo userVo = new UserVo(user);
-//                    userVo.setWorkCount(personnel.getCount());
-//                    userVos.add(userVo);
-//                }
-//            }
-//        }
-//
-//        if(pageRequest.getSort()!=null && pageRequest.getSort()==1) {
-//            Collections.sort(userVos, new Comparator<UserVo>() {
-//                @Override
-//                public int compare(UserVo o1, UserVo o2) {
-//                    return o1.getWorkCount()-o2.getWorkCount();
-//                }
-//            });
-//        }else{
-//            Collections.sort(userVos, new Comparator<UserVo>() {
-//                @Override
-//                public int compare(UserVo o1, UserVo o2) {
-//                    return o2.getWorkCount()-o1.getWorkCount();
-//                }
-//            });
-//        }
-//        int startNum=(pageResponse.getCurrentPage()-1)*10+1;
-//        int endNum = startNum+pageResponse.getPageSize();
-//        List<UserVo> userVos1 = userVos.subList(startNum - 1, endNum - 1);
-//        pageResponse.setRows(userVos1);
-//        pageResponse.setTotalPage((userVos.size()/pageResponse.getPageSize())+1);
-//        pageResponse.setTotalCount(userVos.size());
-//        return null;
     }