修改模具筛选

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

@@ -95,6 +95,5 @@ public class ProjectController{
         msg = projectService.getListByUser(token);
         return msg;
     }
-
 }
 

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

@@ -2,7 +2,9 @@ package com.hssx.cloudmodel.entity.vo;
 
 import com.hssx.cloudmodel.entity.Mould;
 import com.hssx.cloudmodel.entity.Project;
+import com.hssx.cloudmodel.entity.ProjectApprove;
 import com.hssx.cloudmodel.entity.User;
+import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,10 +15,12 @@ import java.util.List;
  * Description:<描述>
  * Version: 1.0
  */
+@Data
 public class ProjectVO extends Project {
     private List<User> customUsers = new ArrayList<>();
     private List<User> ownerUsers = new ArrayList<>();
     private List<Mould> models = new ArrayList<>();
+    private List<ProjectApprove>approves = new ArrayList<>();
 
     public List<User> getCustomUsers() {
         return customUsers;

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

@@ -36,10 +36,19 @@
         <result column="manager_id" property="managerId" />
         <result column="manager" property="manager" />
         <collection property="models" ofType="com.hssx.cloudmodel.entity.Mould">
-            <id column="id" property="id" />
+            <id column="model_id" property="id" />
             <result column="model_no" property="modelNo" />
             <result column="model_name" property="modelName" />
         </collection>
+        <collection property="approves" ofType="com.hssx.cloudmodel.entity.ProjectApprove">
+            <id column="id" property="id" />
+            <result column="approver_id" property="approverId" />
+            <result column="approver_name" property="approverName" />
+            <result column="company_id" property="companyId" />
+            <result column="company_name" property="companyName" />
+            <result column="subordinate_type" property="subordinateType" />
+            <result column="project_id" property="projectId" />
+        </collection>
     </resultMap>
 
     <select id="getProjectListByUid" resultMap="BaseResultMap">
@@ -63,13 +72,15 @@
 
     <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.indate indate,
-        m.model_no model_no,m.model_name model_name
+        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.indate indate,
+        m.id model_id, m.model_no model_no,m.model_name model_name,a.approver_id approver_id,a.approver_name approver_name,a.subordinate_type subordinate_type
     from
         tb_project p
     left join tb_mould m
     on p.id = m.project_id
+    left join tb_project_approve a
+    on p.id = a.project_id
     where
       p.id = #{id}
     </select>