Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

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

@@ -281,6 +281,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         updateTaskRepeatConfigure(task);//将任务中之前的关于重复日期相关的置空
         taskMapper.updateRepeatConfig(task);
         //根据任务的开始时间与当下时间判断任务的状态
+        BeanUtils.copyProperties(taskDto,task);
+        if (taskDto.getStartDate()!=null&&taskDto.getEndDate()!=null&&taskDto.getStartDate().isAfter(taskDto.getEndDate())){
+            msg.setError("请保证时间段的顺序性");
+            return msg;
+        }
         if (taskDto.getStartDate()!=null&&taskDto.getStartDate().isAfter(LocalDateTime.now())){
             task.setStatus(0);
         }else if (taskDto.getEndDate()!=null&&taskDto.getEndDate().isBefore(LocalDateTime.now())){
@@ -289,7 +294,6 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
         {
             task.setStatus(1);
         }
-        BeanUtils.copyProperties(taskDto,task);
         taskMapper.updateById(task);
 
         //删除之前的执行人