From 75afb4100f8ee4449c40997bf64a23baff49e19b Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Wed, 13 Jul 2022 13:52:56 +0800 Subject: [PATCH] zh --- .../controller/manage/TaskController.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/manage/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java index 1ea05b5..a900b2c 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -99,7 +99,7 @@ public class TaskController { task.setStatus(1); } task.setStart( LocalDateTime.of(task.getStart().toLocalDate(), LocalTime.MIN)); - task.setEnd( LocalDateTime.of(task.getEnd().toLocalDate(), LocalTime.MAX)); + task.setEnd( (LocalDateTime.of(task.getEnd().toLocalDate(), LocalTime.MIN).plusDays(1).minusSeconds(1))); task.setCreatAt(LocalDateTime.now()).setUpdateAt(LocalDateTime.now()); taskService.save(task); int id = task.getId(); @@ -159,17 +159,19 @@ public class TaskController { } } List teachRefeUrlList = task.getTeachRefeUrlList(); - for (FileUploadParamVo e : teachRefeUrlList) { - String url = e.getUrl(); - if (url != null && url.lastIndexOf(".") != -1) { - l2.add(new TaskTeachRefe().setTaskId(id).setCreatAt(LocalDateTime.now()).setDuration(e.getDuration()) - .setFileUrl(url).setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf("."))))); + if (teachRefeUrlList != null && teachRefeUrlList.size() > 0) { + for (FileUploadParamVo e : teachRefeUrlList) { + String url = e.getUrl(); + if (url != null && url.lastIndexOf(".") != -1) { + l2.add(new TaskTeachRefe().setTaskId(id).setCreatAt(LocalDateTime.now()).setDuration(e.getDuration()) + .setFileUrl(url).setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf("."))))); + } } } if (l2.size() > 0) { taskTeachRefeService.saveBatch(l2); } - return Result.success("添加完成"); + return Result.success(null,"添加完成"); } @Data @@ -586,11 +588,10 @@ public class TaskController { if (taskDepartmentService.count(new QueryWrapper().eq("taskId", taskId)) == 0) { taskUserSum = userService.count(); }else{ -// taskUserSum = taskService.taskUserSum(taskId); - taskUserSum =userTaskService.count(new QueryWrapper().eq("taskId",taskId)); + taskUserSum = taskService.taskUserSum(taskId); } map.put("taskUserSum",taskUserSum); - map.put("taskUserNum",taskService.taskUserNum(taskId)); + map.put("taskUserNum", taskUserSum =userTaskService.count(new QueryWrapper().eq("taskId",taskId))); } return Result.success(map); }