项目下选择根据公司/所属团队筛选用户账号

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

@@ -31,8 +31,7 @@ public class ProjectController{
 
     /**
      * 添加/修改项目
-     * 参数：projectName 项目名 ,creatorId 创建人id ,creator 创建人名字
-     * ownerCompany 本项目公司id, ownerCompanyName 本公司名字，customerCompany 客户方公司id
+     * 参数：projectName 项目名 ,customerCompany 客户方公司id
      * customerCompanyName 客户方公司名称 chargerId 负责人id,charger 负责人姓名
      * flag 0-添加，1-修改
      *
@@ -94,6 +93,18 @@ public class ProjectController{
         return msg;
     }
 
+    /**
+     * 项目详情
+     * 参数: id 项目id
+     * @return
+     */
+    @ApiOperation("项目详情")
+    @RequestMapping("/detail")
+    @ResponseBody
+    public HttpRespMsg getUserByCompanyIdOrSubordinateType(Project project) {
+        HttpRespMsg msg = projectService.getProjectDetail(project);
+        return msg;
+    }
 
 }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/ProjectVO.java

@@ -0,0 +1,44 @@
+package com.hssx.cloudmodel.entity.vo;
+
+import com.hssx.cloudmodel.entity.Mould;
+import com.hssx.cloudmodel.entity.Project;
+import com.hssx.cloudmodel.entity.User;
+
+import javax.jws.soap.SOAPBinding;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Author: 吴涛涛 cuiyi@itany.com
+ * Date : 2019 - 07 - 30 9:59
+ * Description:<描述>
+ * Version: 1.0
+ */
+public class ProjectVO extends Project {
+    private List<User> users = new ArrayList<>();
+    private List<Mould> models = new ArrayList<>();
+
+    public List<User> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<User> users) {
+        this.users = users;
+    }
+
+    public List<Mould> getModels() {
+        return models;
+    }
+
+    public void setModels(List<Mould> models) {
+        this.models = models;
+    }
+
+    @Override
+    public String toString() {
+        return "ProjectVO{" +
+                "users=" + users +
+                ", models=" + models +
+                '}';
+    }
+}

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/ProjectMapper.java

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.mapper;
 import com.hssx.cloudmodel.entity.Project;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,4 +20,6 @@ import java.util.List;
 public interface ProjectMapper extends BaseMapper<Project> {
 
     List<Project> getProjectListByUid(@Param("keyName") String keyName, @Param("currentUser") User currentUser);
+
+    HttpRespMsg getProjectById(Integer id);
 }

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

@@ -24,4 +24,6 @@ public interface ProjectService extends IService<Project> {
     HttpRespMsg getList(String keyName,PageUtil page,User currentUser);
 
     HttpRespMsg getUserByCompanyIdOrSubordinateType(User user);
+
+    HttpRespMsg getProjectDetail(Project project);
 }

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

@@ -3,9 +3,11 @@ package com.hssx.cloudmodel.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Project;
 import com.hssx.cloudmodel.entity.ProjectUser;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.mapper.CompanyMapper;
 import com.hssx.cloudmodel.mapper.ProjectMapper;
 import com.hssx.cloudmodel.mapper.ProjectUserMapper;
 import com.hssx.cloudmodel.mapper.UserMapper;
@@ -39,6 +41,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     ProjectUserMapper projectUserMapper;
     @Autowired
     UserMapper userMapper;
+    @Autowired
+    CompanyMapper companyMapper;
 
     @Override
     public HttpRespMsg addAndUpdateProject(Project project, Integer flag, User user) {
@@ -57,8 +61,13 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         count += num;
                     }
                     long time = System.currentTimeMillis();
+                    Company company = companyMapper.selectById(user.getCompanyId());
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
                     String seq = sdf.format(time) + String.format("%04d", count);
+                    project.setCreatorId(user.getId());
+                    project.setCreator(user.getUsername());
+                    project.setOwnerCompany(user.getCompanyId());
+                    project.setOwnerCompanyName(company.getCompanyName());
                     project.setProjectNo("YMXM"+seq);
                     project.setCreatorId(user.getId());
                     project.setCreator(user.getUsername());
@@ -129,4 +138,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         msg.data = users;
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getProjectDetail(Project project) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = projectMapper.getProjectById(project.getId());
+        return msg;
+    }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_project_user");
+        strategy.setInclude("tb_project_file");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

cloud-model/src/main/resources/mapper/ProjectMapper.xml

@@ -22,6 +22,23 @@
         <result column="charger" property="charger" />
     </resultMap>
 
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.ProjectVO">
+        <id column="id" property="id" />
+        <result column="project_name" property="projectName" />
+        <result column="project_no" property="projectNo" />
+        <result column="creator_id" property="creatorId" />
+        <result column="creator" property="creator" />
+        <result column="is_delete" property="isDelete" />
+        <result column="customer_company" property="customerCompany" />
+        <result column="customer_company_name" property="customerCompanyName" />
+        <result column="indate" property="indate" />
+        <result column="charger_id" property="chargerId" />
+        <result column="charger" property="charger" />
+        <collection property="models" ofType="com.hssx.cloudmodel.entity.Mould">
+
+        </collection>
+    </resultMap>
+
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id, project_name, project_no, start_time, end_time, content, creator_id, creator, is_delete, owner_company, owner_company_name, customer_company, customer_company_name, indate, charger_id, charger
@@ -45,4 +62,6 @@
             </if>
         </where>
     </select>
+
+    <select id="getProjectById" resultMap="">
 </mapper>