zh

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<FileUploadParamVo> teachRefeUrlList = task.getTeachRefeUrlList();
-        for (FileUploadParamVo e : teachRefeUrlList) {
+        if (teachRefeUrlList != null && teachRefeUrlList.size() > 0) {
-            String url = e.getUrl();
+            for (FileUploadParamVo e : teachRefeUrlList) {
-            if (url != null && url.lastIndexOf(".") != -1) {
+                String url = e.getUrl();
-                l2.add(new TaskTeachRefe().setTaskId(id).setCreatAt(LocalDateTime.now()).setDuration(e.getDuration())
+                if (url != null && url.lastIndexOf(".") != -1) {
-                    .setFileUrl(url).setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf(".")))));
+                    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<TaskDepartment>().eq("taskId", taskId)) == 0) {
             taskUserSum = userService.count();
         }else{
-//            taskUserSum = taskService.taskUserSum(taskId);
+            taskUserSum = taskService.taskUserSum(taskId);
-            taskUserSum =userTaskService.count(new QueryWrapper<UserTask>().eq("taskId",taskId));
         }
         map.put("taskUserSum",taskUserSum);
-        map.put("taskUserNum",taskService.taskUserNum(taskId));
+        map.put("taskUserNum", taskUserSum =userTaskService.count(new QueryWrapper<UserTask>().eq("taskId",taskId)));
         }
         return Result.success(map);
     }