获取急修工

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/MtCompanyUserController.java

@@ -54,8 +54,19 @@ public class MtCompanyUserController {
         return mtCompanyUserService.getCompanyMembers(mtCompanyUserRequest);
     }
 
+    /**
+     * @param
+     * @return
+     * @description 获取急修工
+     * @date 2020-01-06 15:19
+     */
+    @RequestMapping("/getUrgentRepairs")
+    public RestResponse getUrgentRepairs(@RequestBody MtCompanyUserRequest mtCompanyUserRequest) {
+        return mtCompanyUserService.getUrgentRepairs(mtCompanyUserRequest);
+    }
+
     @RequestMapping("/app/getCompanyMembers")
-    public RestResponse appGetCompanyMembers(@RequestBody MtCompanyUserRequest mtCompanyUserRequest){
+    public RestResponse appGetCompanyMembers(@RequestBody MtCompanyUserRequest mtCompanyUserRequest) {
         return mtCompanyUserService.appGetCompanyMembers(mtCompanyUserRequest);
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/IMtCompanyUserService.java

@@ -12,50 +12,58 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IMtCompanyUserService extends IService<MtCompanyUser> {
     /**
-     * @description 分配角色和职业
-     * @date 2019/11/27 10:03 AM
      * @param mtCompanyUserRequest userId:用户id, roleId:角色id, job职业, companyId公司id
      * @return
+     * @description 分配角色和职业
+     * @date 2019/11/27 10:03 AM
      */
     RestResponse assignRole(MtCompanyUserRequest mtCompanyUserRequest);
 
     /**
-     * @description 获取公司团队信息
-     * @date 2019/11/27 10:03 AM
      * @param mtCompanyUserRequest:公司id
      * @return
+     * @description 获取公司团队信息
+     * @date 2019/11/27 10:03 AM
      */
     RestResponse getCompanyMembers(MtCompanyUserRequest mtCompanyUserRequest);
 
     /**
-     * @description 踢出团队
-     * @date 2019-12-16 17:52
      * @param
      * @return
+     * @description 踢出团队
+     * @date 2019-12-16 17:52
      */
     RestResponse kickOutTeam(MtCompanyUserRequest mtCompanyUserRequest);
 
     /**
-     * @description 获取公司用户列表
-     * @date 2019-12-17 11:22
      * @param
      * @return
+     * @description 获取公司用户列表
+     * @date 2019-12-17 11:22
      */
     RestResponse getCompanyUserList(MtCompanyUserRequest mtCompanyUserRequest);
 
     /**
-     * @description 设置急修信息
-     * @date 2019-12-26 17:58
      * @param
      * @return
+     * @description 设置急修信息
+     * @date 2019-12-26 17:58
      */
     RestResponse setRepair(MtCompanyUserRequest mtCompanyUserRequest);
 
     /**
+     * @param
+     * @return
      * @description app获取团队成员列表
      * @date 2020-01-02 16:08
+     */
+    RestResponse appGetCompanyMembers(MtCompanyUserRequest mtCompanyUserRequest);
+
+    /**
      * @param
      * @return
+     * @description 获取急修工
+     * @date 2020-01-06 15:20
      */
-    RestResponse appGetCompanyMembers(MtCompanyUserRequest mtCompanyUserRequest);
+    RestResponse getUrgentRepairs(MtCompanyUserRequest mtCompanyUserRequest);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/MtCompanyUserService.java

@@ -226,7 +226,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
                 .eq("delete_flag", ApiConstants.DELETE_NO)
         );
         List<MtCompanyUser> mtCompanyUserList = companyUserPage.getRecords();
-        if(mtCompanyUserList != null && mtCompanyUserList.size() > 0){
+        if (mtCompanyUserList != null && mtCompanyUserList.size() > 0) {
             List<AppCompanyUserResponse> appCompanyUserResponseList = new ArrayList<>();
             List<Long> userIdList = ProjectUtils.getAttrList(mtCompanyUserList, "userId", null);
             //获取团队用户基础信息
@@ -236,12 +236,12 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
             Map<Long, Role> userIdToRole = roleService.getUserIdToRoleByUserIdsAndCompanyId(userIdList, mtCompanyUserRequest.getCompanyId());
             //获取团队用户操作证信息
             Map<Long, LiftCertificate> userIdToLiftCertificate = projectService.getUserIdToLiftCertificateByUserIdListAndCompanyId(userIdList, mtCompanyUserRequest.getCompanyId());
-            for(MtCompanyUser mtCompanyUser: mtCompanyUserList){
+            for (MtCompanyUser mtCompanyUser : mtCompanyUserList) {
                 AppCompanyUserResponse appCompanyUserResponse = new AppCompanyUserResponse();
                 //设置用户信息
                 UserInfo userInfo = userIdToUserInfo.get(mtCompanyUser.getUserId());
                 //如果用户信息为空，跳过该用户
-                if(userInfo == null){
+                if (userInfo == null) {
                     break;
                 }
                 appCompanyUserResponse.setUserId(userInfo.getUserId());
@@ -252,7 +252,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
 
                 //设置角色信息
                 Role role = userIdToRole.get(mtCompanyUser.getUserId());
-                if(role !=  null){
+                if (role != null) {
                     appCompanyUserResponse.setUserRoleId(role.getId());
                     appCompanyUserResponse.setUserRoleName(role.getName());
                 }
@@ -268,4 +268,17 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         return RestResponse.success();
     }
 
+    @Override
+    public RestResponse getUrgentRepairs(MtCompanyUserRequest mtCompanyUserRequest) {
+        List<MtCompanyUser> mtCompanyUserList = this.list(new QueryWrapper<MtCompanyUser>()
+                .eq("mt_company_id", mtCompanyUserRequest.getCompanyId())
+                .eq("repair_flag", ApiConstants.CompanyConstants.REPAIR_YES)
+                .eq("delete_flag", ApiConstants.DELETE_NO)
+        );
+        //获取用户信息
+        List<Long> userIdList = ProjectUtils.getAttrList(mtCompanyUserList,"userId", null);
+        Map<Long, UserResponse> userIdToUserResponse = userService.getUserResponseByUserIdList(userIdList);
+        return RestResponse.success(userIdToUserResponse.values(), ApiConstants.RESULT_SUCCESS, "获取急修工成功");
+    }
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -209,6 +209,7 @@ public class UserService implements IUserService {
                 UserAccount userAccount = userIdToUserAccount.get(userId);
                 UserInfo userInfo = userIdToUserInfo.get(userId);
                 UserResponse userResponse = new UserResponse();
+                userResponse.setUserId(userId);
                 if (userAccount != null) {
                     //设置用户手机号和用户类型
                     userResponse.setMobile(userAccount.getMobile());