Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-wcz

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractService.java

@@ -78,8 +78,7 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
      * @description 保存项目信息
      * @date 2020/1/14 4:30 下午
      */
-    public boolean saveProject(Contracts contracts, ContractsExtend extend) {
-        Project project = new Project();
+    public boolean saveProject(Contracts contracts, ContractsExtend extend, Project project) {
         project.setProjectName(extend.getProjectName());
         project.setAddress(extend.getProjectAddress());
         project.setNum(contracts.getLiftNum());
@@ -96,6 +95,7 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
      */
     @Transactional(rollbackFor = Exception.class)
     public RestResponse add(ContractsExtend extend) {
+        Project project = new Project();
         Contracts contracts = extend.getContracts();
         if (ObjectUtil.isEmpty(contracts.getCode())) {
             //按当前日期时间戳自动生成合同编号
@@ -103,6 +103,7 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
             contracts.setNextId(contractId);
         }
         contracts.setNextId(contracts.getCode());
+        contracts.setProjectId(project.getId());
         //插入合同信息
         int result = contractsMapper.insert(contracts);
         if (result < 0) {
@@ -111,7 +112,7 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         }
         //插入项目信息
-        boolean info = saveProject(contracts, extend);
+        boolean info = saveProject(contracts, extend, project);
         if (!info) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));

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

@@ -4,6 +4,7 @@ import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.service.ProjectUserService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.CollUtil;
@@ -36,7 +37,7 @@ public class ProjectUserController {
      */
     @PostMapping("user/list")
     public RestResponse userList(@Valid @RequestBody ProjectDetailRequest request) {
-        List<ProjectUser> userList = projectUserService.userList(request.getId());
+        List<ProjectUserResponse> userList = projectUserService.userList(request.getId());
         if (CollUtil.isEmpty(userList)) {
             return RestResponse.success();
         }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectUserMapper.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.project.dao.mapper;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,7 +16,7 @@ import java.util.List;
  */
 public interface ProjectUserMapper extends BaseMapper<ProjectUser> {
 
-    List<ProjectUser> findUserListById(@Param("projectId") Long projectId);
+    List<ProjectUserResponse> findUserListById(@Param("projectId") Long projectId);
 
     /**
      * @param projectId 项目id

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

@@ -186,7 +186,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
         //批量新增项目成员信息
         List<ProjectUser> users = request.getUserList();
         boolean result = projectUserService.saveBatch(users, users.size());
-        if (result) {
+        if (!result) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         }

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.project.service;
 
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectUserRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectUserResponse;
 import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
 import cn.com.ty.lift.common.constants.CommonEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,7 +10,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author bieao
@@ -28,8 +31,12 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
      * @description 查询项目组成员
      * @date 2019/12/13 2:40 PM
      */
-    public List<ProjectUser> userList(Long projectId) {
-        return projectUserMapper.findUserListById(projectId);
+    public List<ProjectUserResponse> userList(Long projectId) {
+        List<ProjectUserResponse> userList = projectUserMapper.findUserListById(projectId);
+        return userList.stream().filter(user -> (
+                CommonEnum.DefaultRole.MTWORK.getCode().equals(user.getUserRole())
+                        || CommonEnum.DefaultRole.REGION_DIRECTOR.getCode().equals(user.getUserRole())
+        )).sorted(Comparator.comparing(ProjectUserResponse::getUserRole)).collect(Collectors.toList());
     }
 
     /**
@@ -58,7 +65,7 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
         QueryWrapper<ProjectUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", projectUser.getUserId());
         queryWrapper.eq("project_id", projectUser.getProjectId());
-        queryWrapper.eq("user_role", projectUser.getUserRole());
+        queryWrapper.eq("user_role", CommonEnum.DefaultRole.MTWORK.getCode());
         return update(projectUser, queryWrapper);
     }
 
@@ -73,6 +80,7 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
         userList.forEach(entry -> {
             entry.setProjectId(request.getProjectId());
             entry.setMtCompanyId(request.getMtCompanyId());
+            entry.setUserRole(CommonEnum.DefaultRole.MTWORK.getCode());
         });
         return projectUserMapper.batchRemoveWithParams(request);
     }