|
@@ -1695,6 +1695,7 @@ class ItemService extends Service
|
|
|
if(empty($data['title'])) return [false, '节点名称不能为空'];
|
|
if(empty($data['title'])) return [false, '节点名称不能为空'];
|
|
|
if(! empty($data['start_time'])) $data['start_time'] = $this->changeDateToDate($data['start_time']);
|
|
if(! empty($data['start_time'])) $data['start_time'] = $this->changeDateToDate($data['start_time']);
|
|
|
if(! empty($data['end_time'])) $data['end_time'] = $this->changeDateToDate($data['end_time'],true);
|
|
if(! empty($data['end_time'])) $data['end_time'] = $this->changeDateToDate($data['end_time'],true);
|
|
|
|
|
+ if(! empty($data['start_time']) && ! empty($data['end_time']) && $data['start_time'] > $data['end_time']) return [false, '开始时间不能大于结束时间'];
|
|
|
|
|
|
|
|
$itemStartTime = $item['start_time'];
|
|
$itemStartTime = $item['start_time'];
|
|
|
$itemEndTime = $item['end_time'];
|
|
$itemEndTime = $item['end_time'];
|
|
@@ -2452,6 +2453,7 @@ class ItemService extends Service
|
|
|
if(empty($data['title'])) return [false, '任务名称不能为空'];
|
|
if(empty($data['title'])) return [false, '任务名称不能为空'];
|
|
|
if(! empty($data['start_time'])) $data['start_time'] = $this->changeDateToDate($data['start_time']);
|
|
if(! empty($data['start_time'])) $data['start_time'] = $this->changeDateToDate($data['start_time']);
|
|
|
if(! empty($data['end_time'])) $data['end_time'] = $this->changeDateToDate($data['end_time'],true);
|
|
if(! empty($data['end_time'])) $data['end_time'] = $this->changeDateToDate($data['end_time'],true);
|
|
|
|
|
+ if(! empty($data['start_time']) && ! empty($data['end_time']) && $data['start_time'] > $data['end_time']) return [false, '开始时间不能大于结束时间'];
|
|
|
|
|
|
|
|
$itemStartTime = $item['start_time'];
|
|
$itemStartTime = $item['start_time'];
|
|
|
$itemEndTime = $item['end_time'];
|
|
$itemEndTime = $item['end_time'];
|