修改获取团队成员接口

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/controller/MaintenanceCompanyController.java

@@ -1,8 +1,12 @@
 package cn.com.ty.lift.enterprise.settings.controller;
 
 
+import cn.com.ty.lift.enterprise.settings.dao.entity.model.MtCompanyRequest;
+import cn.com.ty.lift.enterprise.settings.service.IMaintenanceCompanyService;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -17,4 +21,18 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/mt-company")
 public class MaintenanceCompanyController {
 
+    @Autowired
+    private IMaintenanceCompanyService maintenanceCompanyService;
+
+    /**
+     * @description 获取公司列表
+     * @date 2019-12-11 11:01
+     * @param mtCompanyRequest 请求类
+     * @return
+     */
+    @RequestMapping("/list")
+    @ResponseBody
+    public RestResponse list(MtCompanyRequest mtCompanyRequest){
+        return maintenanceCompanyService.list(mtCompanyRequest);
+    }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/dao/entity/model/MtCompanyRequest.java

@@ -0,0 +1,15 @@
+package cn.com.ty.lift.enterprise.settings.dao.entity.model;
+
+import lombok.Data;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-09
+ * @description 维保公司请求类
+ */
+@Data
+public class MtCompanyRequest {
+    private String name;//公司名称
+    private int pageSize;//每页的条数
+    private int pageNum;//第几页
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/dao/entity/model/MTCompany.java

@@ -2,8 +2,8 @@ package cn.com.ty.lift.enterprise.settings.dao.entity.model;
 
 /**
  * @author huangyuan
- * @date 2019-12-09
- * @description
+ * @date 2019-12-11
+ * @description 维保公司相应类
  */
-public class MTCompany {
+public class MtCompanyResponse {
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/service/IMaintenanceCompanyService.java

@@ -0,0 +1,25 @@
+package cn.com.ty.lift.enterprise.settings.service;
+
+import cn.com.ty.lift.enterprise.settings.dao.entity.MaintenanceCompany;
+import cn.com.ty.lift.enterprise.settings.dao.entity.model.MtCompanyRequest;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 维保公司 服务类
+ * </p>
+ *
+ * @author huangy
+ * @since 2019-12-09
+ */
+public interface IMaintenanceCompanyService extends IService<MaintenanceCompany> {
+
+    /**
+     * @description 分页获取团队信息
+     * @date 2019-12-11 10:26
+     * @param
+     * @return
+     */
+    RestResponse list(MtCompanyRequest mtCompanyRequest);
+}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/service/MaintenanceCompanyService.java

@@ -1,16 +0,0 @@
-package cn.com.ty.lift.enterprise.settings.service;
-
-import cn.com.ty.lift.enterprise.settings.dao.entity.MaintenanceCompany;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 维保公司 服务类
- * </p>
- *
- * @author huangy
- * @since 2019-12-09
- */
-public interface MaintenanceCompanyService extends IService<MaintenanceCompany> {
-
-}

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -1,9 +1,16 @@
 package cn.com.ty.lift.enterprise.settings.service.impl;
 
+import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.enterprise.settings.dao.entity.MaintenanceCompany;
+import cn.com.ty.lift.enterprise.settings.dao.entity.model.MtCompanyRequest;
 import cn.com.ty.lift.enterprise.settings.dao.mapper.MaintenanceCompanyMapper;
-import cn.com.ty.lift.enterprise.settings.service.MaintenanceCompanyService;
+import cn.com.ty.lift.enterprise.settings.service.IMaintenanceCompanyService;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +22,17 @@ import org.springframework.stereotype.Service;
  * @since 2019-12-09
  */
 @Service
-public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompanyMapper, MaintenanceCompany> implements MaintenanceCompanyService {
+public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompanyMapper, MaintenanceCompany> implements IMaintenanceCompanyService {
 
+    @Override
+    public RestResponse list(MtCompanyRequest mtCompanyRequest) {
+        IPage<MaintenanceCompany> maintenanceCompanyPage = new Page<>(
+                mtCompanyRequest.getPageNum(), mtCompanyRequest.getPageSize());
+        maintenanceCompanyPage = this.page(
+                maintenanceCompanyPage, new QueryWrapper<MaintenanceCompany>()
+                //通过公司名称模糊查找公司信息
+                .like(StringUtils.isNotBlank(mtCompanyRequest.getName()), "name", mtCompanyRequest.getName())
+        );
+        return RestResponse.ok(maintenanceCompanyPage, ApiConstants.RESULT_SUCCESS, "获取公司列表成功");
+    }
 }

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

@@ -2,12 +2,14 @@ package cn.com.ty.lift.system.user.service.impl;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
-import cn.com.ty.lift.system.user.dao.entity.UserAccount;
+import cn.com.ty.lift.system.user.dao.entity.UserInfo;
 import cn.com.ty.lift.system.user.dao.entity.UserRole;
 import cn.com.ty.lift.system.user.dao.entity.model.MtCompanyRequest;
+import cn.com.ty.lift.system.user.dao.entity.model.UserResponse;
 import cn.com.ty.lift.system.user.dao.mapper.MtCompanyUserMapper;
 import cn.com.ty.lift.system.user.service.IMtCompanyUserService;
 import cn.com.ty.lift.system.user.service.IUserAccountService;
+import cn.com.ty.lift.system.user.service.IUserInfoService;
 import cn.com.ty.lift.system.user.service.IUserRoleService;
 import cn.com.ty.lift.system.utils.ProjectUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
@@ -17,7 +19,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author huangyuan
@@ -33,6 +37,9 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
     @Autowired
     private IUserAccountService userAccountService;
 
+    @Autowired
+    private IUserInfoService userInfoService;
+
     @Override
     @Transactional
     public RestResponse assignRole(MtCompanyRequest mtCompanyRequest) {
@@ -68,10 +75,28 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
 
     @Override
     public RestResponse getCompanyMembers(MtCompanyRequest mtCompanyRequest) {
+        List<UserResponse> userResponseList = new ArrayList<>();
         List<MtCompanyUser> mtCompanyUserList = this.list(new QueryWrapper<MtCompanyUser>()
                 .eq("mt_company_id", mtCompanyRequest.getCompanyId()));
-        List<String> userIdList = ProjectUtils.getAttrList(mtCompanyUserList, "userId", null);
-        List<UserAccount> userAccountList = (List<UserAccount>) userAccountService.listByIds(userIdList);
-        return RestResponse.ok(userAccountList, ApiConstants.RESULT_SUCCESS, "获取团队用户成功");
+        if(mtCompanyUserList != null && mtCompanyUserList.size() > 0){
+            //获取用户id集合
+            List<Long> userIdList = ProjectUtils.getAttrList(mtCompanyUserList, "userId", null);
+            //获取用户信息集合
+            List<UserInfo> userInfoList = (List<UserInfo>) userInfoService.listByIds(userIdList);
+            Map<Long, UserInfo> userIdToUserInfo = ProjectUtils.attrToObjMap(userInfoList, "userId", null);
+            if(userIdToUserInfo != null && userIdToUserInfo.size() > 0){
+                for(Long userId: userIdList){
+                    //封装用户信息
+                    UserResponse userResponse = new UserResponse();
+                    userResponse.setUserId(userId);
+                    UserInfo userInfo = userIdToUserInfo.get(userId);
+                    if(userInfo != null){
+                        userResponse.setName(userInfo.getName());
+                    }
+                    userResponseList.add(userResponse);
+                }
+            }
+        }
+        return RestResponse.ok(userResponseList, ApiConstants.RESULT_SUCCESS, "获取团队用户成功");
     }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/utils/ProjectUtils.java

@@ -69,6 +69,35 @@ public class ProjectUtils {
         return map;
     }
 
+    /**
+     *  将对象集合转化为attribute->Object的map
+     *@author huangy
+     *@date 2018年12月19日
+     *@param objList
+     *@param attrName:属性名称
+     *@param parameterTypes
+     *@return Map
+     *@throws
+     */
+    public static Map attrToObjMap(List objList, String attrName, Class<?>... parameterTypes){
+
+        Map<Object, Object> map = new HashMap<>();
+        try {
+            if(objList != null && objList.size() > 0) {
+                for(Object o: objList) {
+                    Class<?> classObj = o.getClass();
+                    Method method = classObj.getMethod(PojoUtils.attrGetMethodName(attrName), parameterTypes);
+                    Object attr = method.invoke(o, parameterTypes);
+                    map.put(attr, o);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return map;
+
+    }
+
     /**
      * 通过集合对象集合获取对象id集合
      *