|
|
@@ -4861,9 +4861,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
String lsLastItemId = null;
|
|
|
String btLastItemId = null;
|
|
|
//按人员获取
|
|
|
- ganttData = projectMapper.getTaskPlanByMemb(userIds, startDate ,endDate, user.getCompanyId(),user.getId());
|
|
|
- System.out.println("renyuan==>"+ganttData.size());
|
|
|
- List<ProjectLeader> leaderList = projectLeaderService.list(new QueryWrapper<ProjectLeader>().eq("leader_id", user.getId()).eq("company_id", user.getCompanyId()));
|
|
|
+ ganttData = projectMapper.getTaskPlanByMemb(userIds, startDate + " 00:00:00" ,endDate + " 23:59:59", user.getCompanyId(),user.getId());
|
|
|
QueryWrapper<BusinessTrip> btQueryWrapper =new QueryWrapper<>();
|
|
|
btQueryWrapper.in("owner_id", userIds);
|
|
|
if (startDate != null && endDate != null) {
|
|
|
@@ -4986,7 +4984,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
|
|
|
}
|
|
|
}
|
|
|
System.out.println("按项目查看，项目size="+projectIds.size());
|
|
|
- ganttData = projectMapper.getTaskPlanByProject(projectIds, startDate ,endDate, user.getCompanyId(),groupName,taskType,userIds);
|
|
|
+ ganttData = projectMapper.getTaskPlanByProject(projectIds, startDate + " 00:00:00" ,endDate + " 23:59:59", user.getCompanyId(),groupName,taskType,userIds);
|
|
|
QueryWrapper<BusinessTrip> btQueryWrapper =new QueryWrapper<>();
|
|
|
QueryWrapper<BustripProject> bpQueryWrapper =new QueryWrapper<>();
|
|
|
btQueryWrapper.in("owner_id", userIds);
|
