sunyadv 5 年之前
父节点
当前提交
2e7a5b7c1d

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

@@ -16,6 +16,7 @@ import java.util.List;
 public class ProjectVO extends Project {
 public class ProjectVO extends Project {
     private List<User> customUsers = new ArrayList<>();
     private List<User> customUsers = new ArrayList<>();
     private List<User> ownerUsers = new ArrayList<>();
     private List<User> ownerUsers = new ArrayList<>();
+    private List<User> participateUsers = new ArrayList<>();
     private List<Mould> models = new ArrayList<>();
     private List<Mould> models = new ArrayList<>();
     private List<ProjectApprove>approves = new ArrayList<>();
     private List<ProjectApprove>approves = new ArrayList<>();
     private List<CustomCompany> customCompanies = new ArrayList<>();
     private List<CustomCompany> customCompanies = new ArrayList<>();

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

@@ -354,17 +354,18 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             map.put("approve", approve);
             map.put("approve", approve);
         }
         }
         List<User> users = projectMapper.getProjectUserById(project.getId());
         List<User> users = projectMapper.getProjectUserById(project.getId());
+        vo.setParticipateUsers(users);
         //处理users按照客户呼和供应商分组
         //处理users按照客户呼和供应商分组
         System.out.println("users===>" + users);
         System.out.println("users===>" + users);
-        for (User user : users) {
-            if (user.getSubordinateType() == 0) {
-                //资产方
-                vo.getOwnerUsers().add(user);
-            } else if (user.getSubordinateType() == 1) {
-                //生产方
-                vo.getCustomUsers().add(user);
-            }
-        }
+//        for (User user : users) {
+//            if (user.getSubordinateType() == 0) {
+//                //资产方
+//                vo.getOwnerUsers().add(user);
+//            } else if (user.getSubordinateType() == 1) {
+//                //生产方
+//                vo.getCustomUsers().add(user);
+//            }
+//        }
         map.put("vo", vo);
         map.put("vo", vo);
         msg.data = map;
         msg.data = map;
         return msg;
         return msg;

+ 5 - 5
ys_vue/src/views/project/projectDetail.vue

@@ -51,19 +51,19 @@
                     </span>
                     </span>
                 </el-col> -->
                 </el-col> -->
                 <el-col :span="24" class="detail">
                 <el-col :span="24" class="detail">
-                    资产方人员:
-                    <span class="info" v-for="(item, index) in proDetail.ownerUsers">
+                    普通人员:
+                    <span class="info" v-for="(item, index) in proDetail.participateUsers">
                         {{item.username}}
                         {{item.username}}
-                        <span v-if="index != proDetail.ownerUsers.length-1">、</span>
+                        <span v-if="index != proDetail.participateUsers.length-1">、</span>
                     </span>
                     </span>
                 </el-col>
                 </el-col>
-                <el-col :span="24" class="detail">
+                <!-- <el-col :span="24" class="detail">
                     生产方人员:
                     生产方人员:
                     <span class="info" v-for="(item, index) in proDetail.customUsers">
                     <span class="info" v-for="(item, index) in proDetail.customUsers">
                         {{item.username}}
                         {{item.username}}
                         <span v-if="index != proDetail.customUsers.length-1">、</span>
                         <span v-if="index != proDetail.customUsers.length-1">、</span>
                     </span>
                     </span>
-                </el-col>
+                </el-col> -->
             </el-col>
             </el-col>
              
              
             <el-col :span="24">
             <el-col :span="24">