Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java

@@ -3,8 +3,10 @@ package com.hssx.cloudmodel.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Company;
+import com.hssx.cloudmodel.entity.Project;
 import com.hssx.cloudmodel.entity.User;
 import com.hssx.cloudmodel.entity.vo.CompanyVO;
+import com.hssx.cloudmodel.entity.vo.ProjectVO;
 import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.service.CompanyService;
 import com.hssx.cloudmodel.util.HttpRespMsg;
@@ -167,6 +169,19 @@ public class CompanyController {
         return msg;
     }
 
+    /**
+     * 根据项目id获取项目的生产方公司
+     * 参数 token 身份凭证  projectId 项目id
+     * @return
+     */
+    @ApiOperation(value = "返回当前公司的关联公司列表")
+    @RequestMapping("/ownerRelateCompany")
+    @ResponseBody
+    public HttpRespMsg getProduceCompany(UserVO userVO){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = companyService.getProduceCompany(userVO);
+        return msg;
+    }
 
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/controller/ProjectController.java

@@ -107,5 +107,19 @@ public class ProjectController {
         return msg;
     }
 
+    /**
+     * 获取创建人员分配项目时根据当前人和公司获取项目列表
+     * 参数: token 用户凭证
+     * @return
+     */
+    @ApiOperation("获取创建人员分配项目时根据当前人和公司获取项目列表")
+    @RequestMapping("/getProjectListByUserAndCompany")
+    @ResponseBody
+    public HttpRespMsg getProjectListByUserAndCompany(UserVO userVO){
+        HttpRespMsg msg= new HttpRespMsg();
+        msg = projectService.getProjectListByUserAndCompany(userVO);
+        return msg;
+    }
+
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/controller/UserController.java

@@ -153,5 +153,6 @@ public class UserController {
         HttpRespMsg msg = projectService.getUserByCompanyIdOrSubordinateType(user);
         return msg;
     }
+
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/service/CompanyService.java

@@ -37,4 +37,6 @@ public interface CompanyService extends IService<Company> {
     HttpRespMsg detail(UserVO userVO);
 
     HttpRespMsg getOwnerRelateCompany(CompanyVO companyVO);
+
+    HttpRespMsg getProduceCompany(UserVO userVO);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/ProjectService.java

@@ -37,4 +37,6 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg getModelListByUser(UserVO user, PageUtil page);
 
     HttpRespMsg getListByUser(String token);
+
+    HttpRespMsg getProjectListByUserAndCompany(UserVO userVO);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -311,14 +311,16 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             Company company = companyMapper.selectById(companyVO.getId());
             if(Constant.PRODUCER_COMPANY == company.getCompanyType()){
                 //生产方公司，返回关联的资产方公司列表
-                ides = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>().eq("custom_id", company.getId()))
+                ides = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>()
+                        .eq("custom_id", company.getId()))
                         .stream()
                         .map(AssetCustomCompany::getAssertId)
                         .collect(Collectors.toList());
                 msg.data = companyMapper.selectList(new QueryWrapper<Company>().in("id",ides));
             }else if(Constant.ASSETS_COMPANY == company.getCompanyType()){
                 //资产方公司，返回关联的生产方公司列表
-                ides = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>().eq("assert_id", company.getId()))
+                ides = assetCustomCompanyMapper.selectList(new QueryWrapper<AssetCustomCompany>()
+                        .eq("assert_id", company.getId()))
                         .stream()
                         .map(AssetCustomCompany::getCustomId)
                         .collect(Collectors.toList());
@@ -328,6 +330,19 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         return msg;
     }
 
+    @Override
+    public HttpRespMsg getProduceCompany(UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
+        if(null == currentUser){
+            msg.setError("当前用户不存在或者不存在");
+            return msg;
+        }else{
+            msg.data = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("project_id",userVO.getProjectId()));
+        }
+        return msg;
+    }
+
     @Override
     public HttpRespMsg deleteById(Integer id) {
         HttpRespMsg msg = new HttpRespMsg();

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/ProjectServiceImpl.java

@@ -112,7 +112,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             } else if (flag == 1) {
                 projectMapper.updateById(project);
                 //删除参与人与项目项目经理相同id的人
-                projectUserMapper.delete(new QueryWrapper<ProjectUser>().eq("user_id",project.getManagerId()).eq("project_id",project.getId()));
+                projectUserMapper.delete(new QueryWrapper<ProjectUser>().eq("user_id", project.getManagerId()).eq("project_id", project.getId()));
                 //删除之前添加的生产方公司
                 customCompanyMapper.delete(new QueryWrapper<CustomCompany>().eq("project_id", project.getId()));
                 //重新添加生产方公司
@@ -140,7 +140,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         .map(ProjectApprove::getApproverId)
                         .collect(Collectors.toList());
                 approverIds.add(-1);
-                powerMapper.delete(new QueryWrapper<Power>().in("user_id",approverIds));
+                powerMapper.delete(new QueryWrapper<Power>().in("user_id", approverIds));
                 //重新添加审批人
                 //1.添加资产方审批人
                 if (null != customerApproverId) {
@@ -303,7 +303,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             map.put("download", 1);
             map.put("view", 1);
             map.put("approve", approve);
-        }else if(projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId())) > 0){
+        } else if (projectApproveMapper.selectCount(new QueryWrapper<ProjectApprove>().eq("approver_id", currentUser.getId())) > 0) {
             //是否为审批人
             //该项目的参与人
             Integer update = 0;
@@ -374,7 +374,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Override
     public HttpRespMsg getUserListByCompanyIds(String companyIds, Integer adminId, Integer projectId) {
         HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<User> qw  =new QueryWrapper<User>();
+        QueryWrapper<User> qw = new QueryWrapper<User>();
         if (!"".equals(companyIds) && companyIds != null) {
             List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(companyIds);
             //该项目的项目经理不能充当参与人
@@ -514,4 +514,25 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getProjectListByUserAndCompany(UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
+        List<Project> list = new ArrayList<>();
+        if (user == null) {
+            msg.setError("当前用户未登录，或者用户不存在");
+            return msg;
+        } else {
+            if (Constant.SYS_ID == user.getId()) {
+                //admin创建人员,获取该公司下的所有项目
+                list =  projectMapper.selectList(new QueryWrapper<Project>().eq("owner_company", user.getCompanyId()));
+            }else{
+                //项目经理创建人员，获取当前项目经理的充当项目经理的任务
+                list = projectMapper.selectList(new QueryWrapper<Project>().eq("manager_id", user.getId()));
+            }
+            msg.data = list;
+        }
+        return msg;
+    }
 }