接口自测代码调整

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

@@ -36,6 +36,17 @@ public class MaintenanceCompanyController {
         return maintenanceCompanyService.list(maintenanceCompanyRequest);
     }
 
+    /**
+     * @description 获取用户所在的团队信息
+     * @date 2019-12-23 13:02
+     * @param maintenanceCompanyRequest
+     * @return
+     */
+    @RequestMapping("/ownList")
+    public RestResponse ownList(MaintenanceCompanyRequest maintenanceCompanyRequest){
+        return maintenanceCompanyService.ownList(maintenanceCompanyRequest);
+    }
+
     /**
      * @description 创建团队
      * @date 2019-12-11 14:04

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

@@ -38,4 +38,12 @@ public interface IMaintenanceCompanyService extends IService<MaintenanceCompany>
      * @return
      */
     RestResponse updateMaintenanceCompany(MaintenanceCompanyRequest maintenanceCompanyRequest);
+
+    /**
+     * @description 获取用户团队信息
+     * @date 2019-12-23 13:03
+     * @param maintenanceCompanyRequest
+     * @return
+     */
+    RestResponse ownList(MaintenanceCompanyRequest maintenanceCompanyRequest);
 }

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.system.settings.service.impl;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.constants.CommonEnum;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
 import cn.com.ty.lift.system.settings.dao.mapper.MaintenanceCompanyMapper;
@@ -22,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * <p>
  * 维保公司 服务实现类
@@ -54,8 +57,8 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
                 maintenanceCompanyRequest.getPageNum(), maintenanceCompanyRequest.getPageSize());
         maintenanceCompanyPage = this.page(
                 maintenanceCompanyPage, new QueryWrapper<MaintenanceCompany>()
-                //通过公司名称模糊查找公司信息
-                .like(StringUtils.isNotBlank(maintenanceCompanyRequest.getCompanyName()), "name", maintenanceCompanyRequest.getCompanyName())
+                        //通过公司名称模糊查找公司信息
+                        .like(StringUtils.isNotBlank(maintenanceCompanyRequest.getCompanyName()), "name", maintenanceCompanyRequest.getCompanyName())
         );
         return RestResponse.ok(maintenanceCompanyPage, ApiConstants.RESULT_SUCCESS, "获取公司列表成功");
     }
@@ -120,4 +123,19 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "更新公司信息成功");
     }
 
+    @Override
+    public RestResponse ownList(MaintenanceCompanyRequest maintenanceCompanyRequest) {
+        //获取关联关系
+        List<MtCompanyUser> mtCompanyUserList = mtCompanyUserService.list(new QueryWrapper<MtCompanyUser>()
+                .eq("user_id", maintenanceCompanyRequest.getUserId())
+        );
+        //获取所在的团队信息
+        if(mtCompanyUserList != null){
+            List<Long> companyIdList = ProjectUtils.getAttrList(mtCompanyUserList, "mtCompanyId", null);
+            List<MaintenanceCompany> maintenanceCompanyList = (List<MaintenanceCompany>) this.listByIds(companyIdList);
+            return RestResponse.ok(maintenanceCompanyList, ApiConstants.RESULT_SUCCESS, "获取用户所在团队列表成功");
+        }
+        return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, "用户还未加入任何团队");
+    }
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MtCompanyAttestationServiceImpl.java

@@ -76,8 +76,10 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
     @Override
     @Transactional
     public RestResponse auditPass(CompanyAttestationRequest companyAttestationRequest) {
-        Long companyId = companyAttestationRequest.getMtCompanyId();
         MtCompanyAttestation mtCompanyAttestation = this.getById(companyAttestationRequest.getId());
+        //获取申请的公司id
+        Long companyId = mtCompanyAttestation.getMtCompanyId();
+
         //认证处理
         MaintenanceCompany maintenanceCompany = auditHandle(mtCompanyAttestation, companyAttestationRequest, ApiConstants.CompanyConstants.MAINTENANCE_PASS);
         //1.将认证通过的信息赋值到本来公司信息中

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

@@ -21,6 +21,12 @@ public class MtCompanyUserController {
     @Autowired
     private IMtCompanyUserService mtCompanyUserService;
 
+    /**
+     * @description 获取当前企业用户列表
+     * @date 2019-12-23 14:11
+     * @param
+     * @return
+     */
     @RequestMapping("/list")
     public RestResponse list(MtCompanyUserRequest mtCompanyUserRequest) {
         return mtCompanyUserService.getCompanyUserList(mtCompanyUserRequest);

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

@@ -25,8 +25,14 @@ public class UserApplicationController {
     @Autowired
     private IUserApplicationService userApplicationService;
 
-    @RequestMapping
-    public RestResponse list(UserApplyRequest userApplyRequest){
+    /**
+     * @param
+     * @return
+     * @description 获取申请列表
+     * @date 2019-12-23 14:12
+     */
+    @RequestMapping("/list")
+    public RestResponse list(UserApplyRequest userApplyRequest) {
         return userApplicationService.applyList(userApplyRequest);
     }
 
@@ -42,10 +48,10 @@ public class UserApplicationController {
     }
 
     /**
-     * @description 审核通过
-     * @date 2019-12-13 17:20
      * @param
      * @return
+     * @description 审核通过
+     * @date 2019-12-13 17:20
      */
     @PostMapping("/teamPass")
     public RestResponse teamPass(@RequestBody UserApplyRequest userApplyRequest) {
@@ -53,13 +59,13 @@ public class UserApplicationController {
     }
 
     /**
-     * @description 审核不通过
-     * @date 2019-12-13 17:30
      * @param
      * @return
+     * @description 审核不通过
+     * @date 2019-12-13 17:30
      */
     @PostMapping("/teamFail")
-    public RestResponse teamFail(@RequestBody UserApplyRequest userApplyRequest){
+    public RestResponse teamFail(@RequestBody UserApplyRequest userApplyRequest) {
         return userApplicationService.teamFail(userApplyRequest);
     }