获取团队详情接口

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

@@ -80,4 +80,16 @@ public class MaintenanceCompanyController {
     public RestResponse updateMaintenanceCompany(@RequestBody MaintenanceCompanyRequest maintenanceCompanyRequest) {
         return maintenanceCompanyService.updateMaintenanceCompany(maintenanceCompanyRequest);
     }
+
+    /**
+     * @param
+     * @return
+     * @description 获取团队详情
+     * @date 2020/5/3 11:49 上午
+     */
+    @RequestMapping("/teamInfo")
+    public RestResponse teamInfo(@RequestBody MaintenanceCompanyRequest maintenanceCompanyRequest) {
+        return maintenanceCompanyService.teamInfo(maintenanceCompanyRequest);
+    }
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/MaintenanceCompany.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.time.LocalTime;
 
 /**
@@ -109,7 +109,7 @@ public class MaintenanceCompany implements Serializable {
      * 创建时间
      */
     @TableField("create_date")
-    private LocalDateTime createDate;
+    private LocalDate createDate;
 
     @TableField("limited_num")
     private Integer limitedNum;

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/model/TeamInfoResponse.java

@@ -0,0 +1,56 @@
+package cn.com.ty.lift.system.settings.dao.entity.model;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+/**
+ * @author huangyuan
+ * @date 2020/5/3
+ * @description 团队详情
+ */
+@Data
+public class TeamInfoResponse {
+
+    /**
+     * 团队名
+     */
+    private String name;
+
+    /**
+     * 联系人
+     */
+    private String corporator;
+
+    /**
+     * 联系电话
+     */
+    private String telephone;
+
+    /**
+     * 团队描述
+     */
+    private String remarks;
+
+    /**
+     * 是否认证  '0 未认证 1 已认证 2 审核中 3 认证失败'
+     */
+    private Integer isCertificated;
+
+
+    /**
+     * 注册时间
+     */
+    private LocalDate createDate;
+
+    /**
+     * 团队图片
+     */
+    private String logoImg;
+
+    /**
+     * 团队人数
+     */
+    private Integer userNum;
+
+}

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

@@ -73,4 +73,12 @@ public interface IMaintenanceCompanyService extends IService<MaintenanceCompany>
      * @date 2020/2/17 11:24 上午
      */
     Map<String, List<MaintenanceCompany>> getProvinceCodeToMaintenanceCompany();
+
+    /**
+     * @param
+     * @return
+     * @description 获取团队详情
+     * @date 2020/5/3 11:50 上午
+     */
+    RestResponse teamInfo(MaintenanceCompanyRequest maintenanceCompanyRequest);
 }

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

@@ -13,6 +13,7 @@ import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.dao.entity.MtCompanyAttestation;
 import cn.com.ty.lift.system.settings.dao.entity.model.ConfirmCompanyResponse;
 import cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest;
+import cn.com.ty.lift.system.settings.dao.entity.model.TeamInfoResponse;
 import cn.com.ty.lift.system.settings.dao.mapper.MaintenanceCompanyMapper;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
 import cn.com.ty.lift.system.settings.service.IMtCompanyAttestationService;
@@ -33,11 +34,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -104,6 +103,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         maintenanceCompany.setIsCertificated(ApiConstants.CompanyConstants.MAINTENANCE_NOT_CERTIFICATE);
         maintenanceCompany.setRemarks(maintenanceCompanyRequest.getRemarks());
         maintenanceCompany.setLogoImg(maintenanceCompanyRequest.getLogoImg());
+        maintenanceCompany.setCreateDate(LocalDate.now());
         if (!this.save(maintenanceCompany)) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存团队信息失败");
         }
@@ -252,6 +252,23 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         return provinceCodeToMaintenanceCompany;
     }
 
+    @Override
+    public RestResponse teamInfo(MaintenanceCompanyRequest maintenanceCompanyRequest) {
+        MaintenanceCompany maintenanceCompany = this.getById(maintenanceCompanyRequest.getCompanyId());
+        //设置团队人数
+        setCompanyUserNum(Collections.singletonList(maintenanceCompany));
+        TeamInfoResponse teamInfoResponse = new TeamInfoResponse();
+        teamInfoResponse.setName(maintenanceCompany.getName());
+        teamInfoResponse.setCorporator(maintenanceCompany.getCorporator());
+        teamInfoResponse.setTelephone(maintenanceCompany.getTelephone());
+        teamInfoResponse.setCreateDate(maintenanceCompany.getCreateDate());
+        teamInfoResponse.setRemarks(maintenanceCompany.getRemarks());
+        teamInfoResponse.setIsCertificated(maintenanceCompany.getIsCertificated());
+        teamInfoResponse.setLogoImg(maintenanceCompany.getLogoImg());
+        teamInfoResponse.setUserNum(maintenanceCompany.getUserNum());
+        return RestResponse.success(teamInfoResponse, ApiConstants.RESULT_SUCCESS, "获取团队详情成功");
+    }
+
     /**
      * @param
      * @return

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

@@ -333,17 +333,8 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         projectUser.setIsMonitor("0");
         //保存项目信息
         projectService.saveProjectUser(projectUser);
-        //加入项目审核通过，消息推送
-        ProjectInfo projectInfo = projectService.getProjectById(userApplication.getProjectId());
-        if (projectInfo != null) {
-            UserInfo applyUserInfo = userInfoService.getByUserId(userApplication.getUserId());
-            if (applyUserInfo != null) {
-                PushUserInfo regionDirector = pushUserService.getCompanyUserInfoByUserId(userApplication.getMtCompanyId(),
-                        projectUser.getUserId());
-                PushMessage.workObtainPermission(applyUserInfo.getName(), projectInfo.getProjectName(),
-                        permission.get(userApplication.getPowerType())).sendTokenOnPlatform(jmsMessagingTemplate, regionDirector);
-            }
-        }
+        //加入项目审核通过后消息推送
+        projectPassPushMessage(userApplication, projectUser);
     }
 
     /**
@@ -435,7 +426,6 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
      * @date 2020/5/3 11:05 上午
      */
     private void teamPassPushMessage(Long companyId, Long userId) {
-        //推送消息
         //获取区域主管信息
         List<PushUserInfo> pushUserInfoList = pushUserService.getUserInfoByRoleCode(
                 CommonEnum.DefaultRole.REGION_DIRECTOR.getCode());
@@ -453,4 +443,24 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         }
     }
 
+    /**
+     * @param
+     * @return
+     * @description 加入项目审核通过后消息推送
+     * @date 2020/5/3 11:44 上午
+     */
+    private void projectPassPushMessage(UserApplication userApplication, ProjectUser projectUser) {
+        //加入项目审核通过，消息推送
+        ProjectInfo projectInfo = projectService.getProjectById(userApplication.getProjectId());
+        if (projectInfo != null) {
+            UserInfo applyUserInfo = userInfoService.getByUserId(userApplication.getUserId());
+            if (applyUserInfo != null) {
+                PushUserInfo regionDirector = pushUserService.getCompanyUserInfoByUserId(userApplication.getMtCompanyId(),
+                        projectUser.getUserId());
+                PushMessage.workObtainPermission(applyUserInfo.getName(), projectInfo.getProjectName(),
+                        permission.get(userApplication.getPowerType())).sendTokenOnPlatform(jmsMessagingTemplate, regionDirector);
+            }
+        }
+    }
+
 }