From 193314ff432e2ef961e78561b352d43d3744b5fb Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Tue, 7 Sep 2021 17:26:53 +0800
Subject: [PATCH] 2021.09.07

---
 .../src/main/java/com/ccsens/common/bean/dto/CTaskDto.java | 2 --
 .../main/java/com/ccsens/common/service/TaskService.java   | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/ccsens/common/bean/dto/CTaskDto.java b/common/src/main/java/com/ccsens/common/bean/dto/CTaskDto.java
index dbf3adab..8afaa68d 100644
--- a/common/src/main/java/com/ccsens/common/bean/dto/CTaskDto.java
+++ b/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("描述")
diff --git a/common/src/main/java/com/ccsens/common/service/TaskService.java b/common/src/main/java/com/ccsens/common/service/TaskService.java
index f395a381..88072243 100644
--- a/common/src/main/java/com/ccsens/common/service/TaskService.java
+++ b/common/src/main/java/com/ccsens/common/service/TaskService.java
@@ -641,9 +641,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);
         //任务添加标签（天，普通/日常任务）
         //天