项目的分配

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.entity.vo.ProjectVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 import com.hssx.cloudmodel.util.PageUtil;
 import org.apache.ibatis.annotations.Param;
@@ -21,5 +22,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<Project> getProjectListByUid(@Param("keyName") String keyName, @Param("currentUser") User currentUser);
 
-    HttpRespMsg getProjectById(Integer id);
+    ProjectVO getProjectById(@Param("id")Integer id);
+
+    List<User> getProjectUserById(@Param("id")Integer id);
 }

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

@@ -7,6 +7,7 @@ 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.entity.vo.ProjectVO;
 import com.hssx.cloudmodel.mapper.CompanyMapper;
 import com.hssx.cloudmodel.mapper.ProjectMapper;
 import com.hssx.cloudmodel.mapper.ProjectUserMapper;
@@ -150,7 +151,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Override
     public HttpRespMsg getProjectDetail(Project project) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg.data = projectMapper.getProjectById(project.getId());
+        ProjectVO projectVO = projectMapper.getProjectById(project.getId());
         return msg;
     }
 }

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

@@ -65,5 +65,38 @@
         </where>
     </select>
 
-    <select id="getProjectById" resultMap="">
+    <select id="getProjectById" resultMap="BaseResultMapVO">
+    select
+        p.id id, p.project_name project_name, p.project_no project_no, p.creator_id creator_id, p.creator creator, p.owner_company owner_company,
+        p.owner_company_name owner_company_name,p.customer_company customer_company, p.customer_company_name customer_company_name, p.indate indate,
+        m.model_no model_no,m.model_name model_name
+    from
+        tb_project p
+    left join tb_mould m
+    on p.id = m.project_id
+    where
+      p.id = #{id}
+    </select>
+
+    <resultMap id="UserResultMap" type="com.hssx.cloudmodel.entity.User">
+        <id column="id" property="id" />
+        <result column="username" property="username" />
+        <result column="role_type" property="roleType" />
+        <result column="company_id" property="companyId" />
+        <result column="head_imgurl" property="headImgurl" />
+        <result column="subordinate_type" property="subordinateType" />
+    </resultMap>
+
+    <select id="getProjectUserById" resultMap="UserResultMap">
+        select
+          u.id id, u.username username, u.indate indate, u.head_imgurl head_imgurl, u.subordinate_type subordinate_type
+        from
+          tb_project_user pu
+        left join
+          tb_user u
+        on
+          pu.user_id = u.id
+        where
+          pu.project_id = #{id}
+    </select>
 </mapper>