胡庆余堂

app/Service/ItemService.php

@@ -238,11 +238,23 @@ class ItemService extends Service
     public function itemRule(&$data, $user, $is_add = true){
         if(empty($data['code'])) return [false, '编码不能为空'];
         if(empty($data['title'])) return [false, '名称不能为空'];
+        if (!empty($data['start_time']) || !empty($data['end_time'])) {
+            if (empty($data['start_time']) || empty($data['end_time'])) {
+                return [false, '立项时间和完成时间必须同时填写'];
+            }
+        }
+
         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);
 //        $isMonthEnd = date('j', $data['end_time']) == date('t', $data['end_time']);
 //        if(! $isMonthEnd) return [false, '项目结束日期必须是当月最后一天'];
 
+        if (!empty($data['start_time']) && !empty($data['end_time'])) {
+            if ($data['end_time'] < $data['start_time']) {
+                return [false, '完成时间不能早于立项时间'];
+            }
+        }
+
         if(empty($data['is_use'])) return [false, '是否启用不能为空'];
         if(! isset(Item::Use[$data['is_use']])) return [false, '是否启用错误'];