文字修改

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

@@ -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);

fhKeeper/formulahousekeeper/timesheet_mld/src/i18n/zh.json

@@ -150,7 +150,7 @@
     "phone": "手机号",
     "subproject": "子项目",
     "budgetSource": "预算来源",
-    "taskGrouping": "任务分组",
+    "taskGrouping": "分组",
     "percentageOfTime": "用时占比",
     "filledReport": "已填日报",
     "department": "部门",
@@ -219,7 +219,7 @@
     "reason": "原因",
     "waitingForProfessionalReview": "待专业审核",
     "waitingForDepartmentReview": "待部门审核",
-    "taskGroup": "任务分组",
+    "taskGroup": "分组",
     "inputStage": "投入阶段",
     "professionalProgress": "专业进度",
     "schedule": "进度",
@@ -471,7 +471,7 @@
   "zongjia": "总价",
   "waiforverification": "导入成功，请等待审核",
   "apportionmentratiodata": "条分摊比例数据",
-  "tasklist": "任务列表",
+  "tasklist": "计划列表",
   "ongoing": "进行中",
   "subordinatedepartments": "所属部门",
   "types": "类型",
@@ -479,10 +479,10 @@
   "starttimes": "开始时间",
   "deadline": "截止时间",
   "interval": "区间",
-  "alltaskss": "全部任务",
+  "alltaskss": "全部计划",
   "perform": "我执行的",
   "created": "我创建的",
-  "taskstage": "任务阶段",
+  "taskstage": "阶段",
   "nameofthetask": "计划名称",
   "zhi-hang-ren": "执行人",
   "wan-cheng": "完成",