Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

lift-batch-service/src/main/java/cn/com/ty/lift/batch/config/AppletDataSchedulingConfig.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.batch.config;
 import cn.com.ty.lift.batch.applet.util.DataInitUtil;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
 
 import javax.annotation.Resource;
 
@@ -19,7 +20,7 @@ public class AppletDataSchedulingConfig {
     private DataInitUtil dataInitUtil;
 
     //定时刷新redis中的数据，每天凌晨两点执行
-    //@Scheduled(cron = "0 0 2 * * ?")
+    @Scheduled(cron = "0 0 2 * * ?")
     public void flushRedisCacheData(){
         dataInitUtil.initAppletData();
     }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectController.java

@@ -22,6 +22,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * @author bieao
@@ -60,7 +61,7 @@ public class ProjectController {
      * @description 获取物业端数据接口
      * @date 2020/5/11 10:21 上午
      */
-    @PostMapping("/propertyList")
+    @PostMapping("propertyList")
     public RestResponse propertyList(@RequestBody ProjectRequest request) {
         IPage<Project> page = projectService.propertyList(request);
         return RestResponse.success(page, "获取项目列表成功");
@@ -130,6 +131,19 @@ public class ProjectController {
         return RestResponse.success(resultMap, MessageUtils.get("msg.query.detail.success"));
     }
 
+    /**
+     * @param projectRequest 项目id
+     * @return 项目详情
+     * @description
+     * @date 2020/5/13 8:57 上午
+     */
+    @PostMapping("propertyDetail")
+    @Validation(fields = {"id"})
+    public RestResponse propertyDetail(@Val @RequestBody ProjectRequest projectRequest) {
+        Optional<Project> project = projectService.getOne(projectRequest.getId());
+        return RestResponse.success(project, "获取项目详情成功");
+    }
+
     /**
      * @param request 新增项目数据项
      * @return 1.成功, 0.失败, 消息描述

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

@@ -19,7 +19,6 @@ import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
 import cn.com.ty.lift.system.settings.service.IMtCompanyAttestationService;
 import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
 import cn.com.ty.lift.system.user.dao.entity.Role;
-import cn.com.ty.lift.system.user.dao.entity.UserAccount;
 import cn.com.ty.lift.system.user.dao.entity.UserRole;
 import cn.com.ty.lift.system.user.dao.entity.model.MenuRequest;
 import cn.com.ty.lift.system.user.service.*;
@@ -111,14 +110,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         Long companyId = maintenanceCompany.getId();
 
         //创建团队成功
-        //1.设置申请用户为企业管理员
-        UserAccount userAccount = userAccountService.getByUserId(userId);
-        userAccount.setType(ApiConstants.UserConstants.TYPE_ENTERPRISE_ADMIN);
-        if (!userAccountService.updateById(userAccount)) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "更新用户信息失败");
-        }
-        //2.设置用户类型为企业管理员
+        //1.设置用户类型为企业管理员
         MtCompanyUser mtCompanyUser = new MtCompanyUser();
         mtCompanyUser.setCreateUserId(userId);
         mtCompanyUser.setUserId(userId);
@@ -127,7 +119,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存成员关联公司信息失败");
         }
-        //3.创建默认角色-企业管理员
+        //2.创建默认角色-企业管理员
         Role role = new Role();
         role.setName(CommonEnum.DefaultRole.ENTERPRISE_ADMIN.getLabel());
         role.setCode(CommonEnum.DefaultRole.ENTERPRISE_ADMIN.getCode());
@@ -137,7 +129,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存角色信息失败");
         }
-        //4.创建用户角色关联关系
+        //3.创建用户角色关联关系
         UserRole userRole = new UserRole();
         userRole.setUserId(userId);
         userRole.setRoleId(role.getId());

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/UserApplyResponse.java

@@ -21,4 +21,5 @@ public class UserApplyResponse {
     private Integer powerType;//申请权限
     private LocalDateTime applyDate;//申请日期
     private LocalDateTime dealDate;//处理日期
+    private String roleName;//角色名称
 }

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

@@ -11,10 +11,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IUserRoleService extends IService<UserRole> {
 
     /**
-     * @description 通过用户id和公司id获取用户角色关联信息
-     * @date 2019/11/27 10:03 AM
      * @param userRole 关联对象
      * @return
+     * @description 通过用户id和公司id获取用户角色关联信息
+     * @date 2019/11/27 10:03 AM
      */
     UserRole getByUserRole(UserRole userRole);
 }

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

@@ -10,10 +10,7 @@ import cn.com.ty.lift.common.utils.SendMessageUtil;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
-import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
-import cn.com.ty.lift.system.user.dao.entity.UserApplication;
-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.*;
 import cn.com.ty.lift.system.user.dao.entity.model.*;
 import cn.com.ty.lift.system.user.dao.mapper.UserApplicationMapper;
 import cn.com.ty.lift.system.user.service.*;
@@ -54,6 +51,9 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
     @Resource
     private IUserRoleService userRoleService;
 
+    @Resource
+    private IRoleService roleService;
+
     @Resource
     private IUserService userService;
 
@@ -142,7 +142,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
 
     @Override
     public RestResponse applyList(UserApplyRequest userApplyRequest) {
-
+        Long companyId = userApplyRequest.getCompanyId();
         List<Long> userQueryIdList = null;
         //通过用户名或手机号查找用户id
         if (StringUtils.isNotBlank(userApplyRequest.getQueryCondition())) {
@@ -151,7 +151,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         //获取所有状态的申请信息集合
         List<UserApplication> userApplicationListResult = this.list(new QueryWrapper<UserApplication>()
                 .select("status")
-                .eq("mt_company_id", userApplyRequest.getCompanyId())
+                .eq("mt_company_id", companyId)
         );
         //封装不同状态的条数信息
         ApplyPageResponse applyPageResponse = new ApplyPageResponse();
@@ -162,13 +162,15 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         IPage userApplicationPage = new Page(userApplyRequest.getPageNum(), userApplyRequest.getPageSize());
         userApplicationPage = this.page(userApplicationPage, new QueryWrapper<UserApplication>()
                 .in(userQueryIdList != null && userQueryIdList.size() > 0, "user_id", userQueryIdList)
-                .eq("mt_company_id", userApplyRequest.getCompanyId())
+                .eq("mt_company_id", companyId)
                 .eq("status", userApplyRequest.getStatus())
         );
         List<UserApplication> userApplicationList = userApplicationPage.getRecords();
         if (userApplicationList != null && userApplicationList.size() > 0) {
             //获取用id集合
             List<Long> userIdList = ProjectUtils.getAttrList(userApplicationList, "userId", null);
+            //获取用户id -> 角色关系
+            Map<Long, Role> userIdToRole = roleService.getUserIdToRoleByUserIdsAndCompanyId(userIdList, companyId);
             //用户id对应的用户基本信息
             Map<Long, UserResponse> userIdToUserResponse = userService.getUserResponseByUserIdList(userIdList);
             for (UserApplication userApplication : userApplicationList) {
@@ -179,7 +181,13 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
                     userApplyResponse.setUserAvatarUrl(userResponse.getAvatarUrl());
                     userApplyResponse.setUserName(userResponse.getName());
                     userApplyResponse.setUserMobile(userResponse.getMobile());
-                    userApplyResponse.setUserType(userResponse.getType());
+                }
+                //设置申请人角色信息
+                if (userIdToRole != null) {
+                    Role role = userIdToRole.get(userApplication.getUserId());
+                    if(role != null) {
+                        userApplyResponse.setRoleName(role.getName());
+                    }
                 }
                 //设置申请基础信息
                 userApplyResponse.setApplyDate(userApplication.getApplyDate());

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

@@ -1,12 +1,17 @@
 package cn.com.ty.lift.system.user.service.impl;
 
+import cn.com.ty.lift.system.user.dao.entity.Role;
 import cn.com.ty.lift.system.user.dao.entity.UserRole;
 import cn.com.ty.lift.system.user.dao.mapper.UserRoleMapper;
 import cn.com.ty.lift.system.user.service.IUserRoleService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.sql.Wrapper;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author huangyuan
@@ -24,4 +29,5 @@ public class UserRoleService extends ServiceImpl<UserRoleMapper, UserRole> imple
     public UserRole getByUserRole(UserRole userRole) {
         return userRoleMapper.getByUserRole(userRole);
     }
+
 }

lift-system-service/src/main/resources/mapper/CommonDataMapper.xml

@@ -159,7 +159,7 @@
         where
         mp.mt_company_id = #{mtCompanyId}
         and
-        mp.plan_date <![CDATA[ >= ]]> #{monthEndStr}
+        mp.plan_date <![CDATA[ >= ]]> #{monthBeginStr}
         and
         mp.plan_date <![CDATA[ <= ]]> #{monthEndStr}