项目详情

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

@@ -14,15 +14,24 @@ import java.util.List;
  * Version: 1.0
  */
 public class ProjectVO extends Project {
-    private List<User> users = new ArrayList<>();
+    private List<User> customUsers = new ArrayList<>();
+    private List<User> ownerUsers = new ArrayList<>();
     private List<Mould> models = new ArrayList<>();
 
-    public List<User> getUsers() {
-        return users;
+    public List<User> getCustomUsers() {
+        return customUsers;
     }
 
-    public void setUsers(List<User> users) {
-        this.users = users;
+    public void setCustomUsers(List<User> customUsers) {
+        this.customUsers = customUsers;
+    }
+
+    public List<User> getOwnerUsers() {
+        return ownerUsers;
+    }
+
+    public void setOwnerUsers(List<User> ownerUsers) {
+        this.ownerUsers = ownerUsers;
     }
 
     public List<Mould> getModels() {
@@ -36,7 +45,8 @@ public class ProjectVO extends Project {
     @Override
     public String toString() {
         return "ProjectVO{" +
-                "users=" + users +
+                "customUsers=" + customUsers +
+                ", ownerUsers=" + ownerUsers +
                 ", models=" + models +
                 '}';
     }

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

@@ -151,7 +151,19 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     @Override
     public HttpRespMsg getProjectDetail(Project project) {
         HttpRespMsg msg = new HttpRespMsg();
-        ProjectVO projectVO = projectMapper.getProjectById(project.getId());
+        ProjectVO vo = projectMapper.getProjectById(project.getId());
+        List<User> users = projectMapper.getProjectUserById(project.getId());
+        //处理users按照客户呼和供应商分组
+        for (User user : users) {
+            if(user.getSubordinateType()==0){
+                //供应商
+                vo.getOwnerUsers().add(user);
+            }else if(user.getSubordinateType()==1){
+                //客户
+                vo.getCustomUsers().add(user);
+            }
+        }
+        msg.data = vo;
         return msg;
     }
 }