添加类型区分字段

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/vo/GanttDataItem.java

@@ -23,4 +23,5 @@ public class GanttDataItem {
     public String color;
     public Integer level;
     public List<GanttDataItem> children;
+    public Integer objType;//对象类型:0是人员,1是部门,2是项目
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -4724,7 +4724,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     userIds.add(user.getId());
                 }
             }
-        } else {
+        }
+        else {
             //查看全部
             List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
             userIds = userList.stream().map(User::getId).collect(Collectors.toList());
@@ -4778,6 +4779,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.parent=String.valueOf(department.getSuperiorId());
                         parent.type="milestone";
                     }
+                    parent.setObjType(1);
                     Set set=new HashSet();
                     if(set.add(parent.id)){
                         itemList.add(parent);
@@ -4810,6 +4812,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         userGantt.end_date = null;
                         userGantt.time = 0;
                         userGantt.parent=String.valueOf(u.getDepartmentId());
+                        userGantt.setObjType(0);
                         itemList.add(userGantt);
                     }
                 }
@@ -4835,6 +4838,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.end_date = leaveSheetList.get(i).getEndDate().toString();
                         parent.time = 0;
                         parent.parent=String.valueOf(departmentId);
+                        parent.setObjType(0);
                         itemList.add(parent);
                         lsLastItemId =leaveSheetList.get(i).getOwnerId();
                     }
@@ -4894,6 +4898,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.end_date = businessTripList.get(i).getEndDate().toString();
                         parent.time = 0;
                         parent.parent=String.valueOf(departmentId);
+                        parent.setObjType(0);
                         itemList.add(parent);
                         btLastItemId =businessTripList.get(i).getOwnerId();
                     }
@@ -4906,10 +4911,12 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                     curItem.end_date =businessTripList.get(i).getEndDate().toString();
                     curItem.parent = btLastItemId;
+                    curItem.setObjType(0);
                     itemList.add(curItem);
                     btLastItemId = businessTripList.get(i).getOwnerId();
                 }
-            } else {
+            }
+            else {
                 //按照项目获取
                 String btLastItemId = null;
                 GanttDataItem btLastParentItem=null;
@@ -4973,6 +4980,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                                 parent.start_date = bustripProject.getStartDate().toString();
                                 parent.end_date = bustripProject.getEndDate().toString();
                                 parent.time = 0;
+                                parent.setObjType(0);
                                 itemList.add(parent);
                                 btLastItemId = String.valueOf(bustripProject.getProjectId());
                             }
@@ -4984,12 +4992,15 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                             curItem.start_date = bustripProject.getStartDate().toString();
                             curItem.end_date = bustripProject.getEndDate().toString();
                             curItem.parent = btLastItemId;
+                            curItem.setObjType(2);
                             itemList.add(curItem);
                             btLastItemId = String.valueOf(bustripProject.getProjectId());
                         }
                     }
                 }
             }
+
+            ganttData.forEach(System.out::println);
             String lastItemId = null;
             GanttDataItem lastParentItem = null;
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -5024,6 +5035,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.end_date = end_date;
                         parent.time = 0;
                         parent.parent=String.valueOf(departmentId);
+                        parent.setObjType(0);
                         itemList.add(parent);
                         lastItemId = userId;
                         lastParentItem = parent;
@@ -5037,6 +5049,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     curItem.end_date = end_date;
                     curItem.time = (Integer)map.get("duration");
                     curItem.parent = lastItemId;
+                    curItem.setObjType(2);
                     itemList.add(curItem);
                     lastItemId = userId;
                 } else {
@@ -5050,6 +5063,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         parent.start_date = start_date;
                         parent.end_date = end_date;
                         parent.time = 0;
+                        parent.setObjType(2);
                         itemList.add(parent);
                         lastItemId = projectId;
                         lastParentItem = parent;
@@ -5061,6 +5075,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     curItem.end_date = end_date;
                     curItem.time = (Integer)map.get("duration");
                     curItem.parent = lastItemId;
+                    curItem.setObjType(2);
                     itemList.add(curItem);
                     lastItemId = projectId;
                 }

fhKeeper/formulahousekeeper/management-platform/src/main/resources/application.yml

@@ -15,7 +15,7 @@ spring:
       location: C:/upload/
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://1.94.62.58:17089/man_mld?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
+    url: jdbc:mysql://1.94.62.58:17089/man_dev?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&useSSL=false
     username: root
     password: P011430@Huoshi*
 #    url: jdbc:mysql://47.100.37.243:7644/man_hour_manager?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&rewriteBatchedStatements=true