|
@@ -97,7 +97,6 @@ public class TaskController {
|
|
task.setCreatorColor(user.getColor());
|
|
task.setCreatorColor(user.getColor());
|
|
task.setCompanyId(user.getCompanyId());
|
|
task.setCompanyId(user.getCompanyId());
|
|
}
|
|
}
|
|
-
|
|
|
|
if (!StringUtils.isEmpty(executorListStr)) {
|
|
if (!StringUtils.isEmpty(executorListStr)) {
|
|
List<User> allUsers = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
|
|
List<User> allUsers = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
|
|
List<TaskExecutor> executorList = JSONArray.parseArray(executorListStr, TaskExecutor.class);
|
|
List<TaskExecutor> executorList = JSONArray.parseArray(executorListStr, TaskExecutor.class);
|
|
@@ -185,6 +184,12 @@ public class TaskController {
|
|
msgRecepientList = task.getExecutorList().stream().filter(newT->!StringUtils.isEmpty(newT.getExecutorId()) && !oldExeList.stream().anyMatch(old->newT.getExecutorId().equals(old.getExecutorId())))
|
|
msgRecepientList = task.getExecutorList().stream().filter(newT->!StringUtils.isEmpty(newT.getExecutorId()) && !oldExeList.stream().anyMatch(old->newT.getExecutorId().equals(old.getExecutorId())))
|
|
.map(TaskExecutor::getExecutorId).collect(Collectors.toList());
|
|
.map(TaskExecutor::getExecutorId).collect(Collectors.toList());
|
|
}
|
|
}
|
|
|
|
+ if(task.getStartDate()==null){
|
|
|
|
+ taskMapper.updateStartDate(task.getId());
|
|
|
|
+ }
|
|
|
|
+ if(task.getEndDate()==null){
|
|
|
|
+ taskMapper.updateEndDate(task.getId());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
System.out.println(task.getStartDate());
|
|
System.out.println(task.getStartDate());
|
|
System.out.println(task.getEndDate());
|
|
System.out.println(task.getEndDate());
|