Merge branch 'tall3' of dd.tall.wiki:ccsens_wiki/ccsenscloud into tall3

common/src/main/java/com/ccsens/common/bean/dto/CTaskDto.java

@@ -87,10 +87,8 @@ public class CTaskDto {
         @NotBlank(message = "任务名不能为空")
         @ApiModelProperty("任务名")
         private String name;
-        @NotNull(message = "开始时间不能为空")
         @ApiModelProperty("开始时间")
         private Long startTime;
-        @NotNull(message = "结束时间不能为空")
         @ApiModelProperty("结束时间")
         private Long endTime;
         @ApiModelProperty("描述")

common/src/main/java/com/ccsens/common/service/TaskService.java

@@ -638,9 +638,12 @@ public class TaskService implements ITaskService {
         //任务分解信息
         ProTaskSub taskSub = new ProTaskSub();
         taskSub.setId(snowflake.nextId());
-        taskSub.setPlanStartTime(param.getStartTime());
-        taskSub.setPlanEndTime(param.getEndTime());
         taskSub.setTaskDetailId(proTaskDetail.getId());
+        if (ObjectUtil.isNotNull(param.getStartTime()) && ObjectUtil.isNotNull(param.getEndTime())) {
+            taskSub.setPlanStartTime(param.getStartTime());
+            taskSub.setPlanEndTime(param.getEndTime());
+            taskSub.setPlanDuration(param.getEndTime() - param.getStartTime());
+        }
         taskSubDao.insertSelective(taskSub);
         //任务添加标签（天，普通/日常任务）
         //天