mld测试修改1

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/controller/TaskController.java

@@ -557,13 +557,6 @@ public class TaskController {
                 taskDailyAllocateService.saveBatch(allocateArrayList);
             }
         }
-        //todo 需要确认一下审核状态能不能修改
-//        else if (saved) {
-//            if (!allocateArrayList.isEmpty()) {
-//                taskDailyAllocateService.remove(new QueryWrapper<TaskDailyAllocate>().eq("task_id",task.getId()));
-//                taskDailyAllocateService.saveBatch(allocateArrayList);
-//            }
-//        }
 
         if (task.getExecutorId() == null) {
             //清空执行人

fhKeeper/formulahousekeeper/management-platform-mld/src/main/java/com/management/platform/controller/TaskDailyAllocateController.java

@@ -58,7 +58,7 @@ public class TaskDailyAllocateController {
             for (TaskDailyAllocate taskDailyAllocate : taskDailyAllocates) {
                 int count=taskDailyAllocateService.getConflict(taskDailyAllocate, request);
                 if(count>0){
-                    msg.setError("选择时间段:"+taskDailyAllocate.getAllocateDate()+"日:"+taskDailyAllocate.getStartTime()+"--"+taskDailyAllocate.getStartTime()+"跟其他时间段存在冲突");
+                    msg.setError("选择时间段:"+taskDailyAllocate.getAllocateDate()+"日:"+taskDailyAllocate.getStartTime()+"--"+taskDailyAllocate.getEndTime()+"跟其他时间段存在冲突");
                     return msg;
                 }
             }

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

@@ -5163,7 +5163,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                     curItem.id = exeId;
                     curItem.userId = (String) map.get("user_id");
-                    curItem.text = (String) map.get("project_name")+"/"+(String)map.get("task_name");
+                    String s = map.get("project_name") == null ? "请假" : (String) map.get("project_name");
+                    curItem.text = s +"/"+(String)map.get("task_name");
                     curItem.start_date = start_date;
 
                     curItem.setTaskPlanType(map.get("taskPlanType")==null?null:(Integer)map.get("taskPlanType"));
@@ -5191,7 +5192,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         GanttDataItem parent = new GanttDataItem();
                         parent.id = projectId;
                         parent.userId = (String) map.get("user_id");
-                        parent.text = (String) map.get("project_name");
+                        String s = map.get("project_name") == null ? "请假" : (String) map.get("project_name");
+                        parent.text = s;
                         parent.render = "split";
                         parent.start_date = start_date;
                         parent.end_date = end_date;
@@ -13014,7 +13016,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                     curItem.id = exeId;
                     curItem.userId = (String) map.get("user_id");
-                    curItem.text = (String) map.get("project_name")+"/"+(String)map.get("task_name");
+                    String s = map.get("project_name") == null ? "请假" : (String) map.get("project_name");
+                    curItem.text = s+"/"+(String)map.get("task_name");
                     curItem.start_date = start_date;
 
                     curItem.end_date = end_date;
@@ -13030,7 +13033,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                         GanttDataItem parent = new GanttDataItem();
                         parent.id = projectId;
                         parent.userId = (String) map.get("user_id");
-                        parent.text = (String) map.get("project_name");
+                        String s = map.get("project_name") == null ? "请假" : (String) map.get("project_name");
+                        parent.text = s;
                         parent.render = "split";
                         parent.start_date = start_date;
                         parent.end_date = end_date;
@@ -13924,10 +13928,14 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                     StringBuilder content= new StringBuilder();
                     double sum = gantExportVoList.stream().mapToDouble(GantExportVo::getTotalWorkHour).sum();
                     double remain = 7.5 - sum;
-                    content.append("共").append(sum).append("h(剩余工时)").append(remain).append("h\n");
+                    content.append("共").append(sum).append("h(剩余工时").append(remain).append("h)\n");
 
                     for (GantExportVo exportVo : gantExportVoList) {
-                        content.append(exportVo.getProjectName()).append(" ").append(exportVo.getTotalWorkHour()).append("h\n");
+                        String projectName = exportVo.getProjectName();
+                        if (StringUtils.isEmpty(projectName)||projectName.equals("null")){
+                            projectName="请假";
+                        }
+                        content.append(projectName).append(" ").append(exportVo.getTotalWorkHour()).append("h\n");
                     }
                     strings.add(content.toString());
 

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

@@ -698,7 +698,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                         if (projectCell == null || StringUtils.isEmpty(projectCell.getStringCellValue())) {
                             throw new Exception("第" + (rowIndex + 1) + "行,项目为空");
                         } else {
-                            Optional<Project> first = allProjectList.stream().filter(t -> t.getProjectName().equals(projectCell.getStringCellValue())).findFirst();
+                            String projectNameString = projectCell.getStringCellValue();
+                            Optional<Project> first = allProjectList.stream().filter(t -> t.getProjectName().equals(projectNameString)).findFirst();
                             if (first.isPresent()) {
                                 task.setProjectId(first.get().getId());
                             } else {
@@ -932,8 +933,8 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                     task.setExecutorId(exectorIds.toString());
                     task.setExecutorColor(exectorColors.toString());
 
-                    taskMapper.updateById(task);
                     taskExecutorService.saveBatch(taskExecutors);
+                    taskMapper.updateById(task);
 
                     taskDailyAllocate.setTaskId(task.getId());
                     taskDailyAllocateService.save(taskDailyAllocate);
@@ -944,7 +945,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                     if (projectFirst.isPresent()) {
                         Project project = projectFirst.get();
                         Information information = new Information();
-                        String executorNames = task.getExecutorList().stream()
+                        String executorNames = taskExecutors.stream()
                                 .map(TaskExecutor::getExecutorName)
                                 .collect(Collectors.joining(","));