cqp 3 tuần trước cách đây
mục cha
commit
65348a0140

+ 1 - 1
app/Service/EmployeeService.php

@@ -314,7 +314,7 @@ class EmployeeService extends Service
                 if(empty($value['type'])) return [false, '人员指标类型不能为空'];
                 if(! isset(EmployeeIndex::$type_name[$value['type']])) return [false, '人员指标类型不存在'];
                 $name = EmployeeIndex::$type_name[$value['type']];
-                if(empty($value['crt_time']) || ! is_array($value['crt_time'])) return [false, $name . ":时间区间不能为空"];
+                if(empty($value['crt_time'][0]) || empty($value['crt_time'][1]) || ! is_array($value['crt_time'])) return [false, $name . ":时间区间不能为空"];
                 list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($value['crt_time']);
                 $data['index_array'][$key]['start_time'] = $start_time;
                 $data['index_array'][$key]['end_time'] = $end_time;

+ 1 - 1
app/Service/GiveOutService.php

@@ -141,7 +141,7 @@ class GiveOutService extends Service
         $data['send_time'] = $this->changeDateToDate($data['send_time']);
         if($data['send_time'] == null) return [false, '发放日期错误'];
 
-        if(empty($data['belong_time'])) return [false, '归属日期不能为空'];
+        if(empty($data['belong_time'][0]) || empty($data['belong_time'][1])) return [false, '归属日期不能为空'];
         list($start_time,$end_time) = $this->changeDateToTimeStampAboutRange($data['belong_time'], false);
         if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "归属日期的区间无效"];
         $data['start_time'] = $start_time;

+ 3 - 3
app/Service/StatisticsService.php

@@ -13,7 +13,7 @@ class StatisticsService extends Service
         $model = RevenueCostTotal::where('del_time',0)
             ->select($field)
             ->orderby('id', 'desc');
-        if(! empty($data['order_time'])){
+        if(! empty($data['order_time'][0]) && ! empty($data['order_time'][1])){
             list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
             if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];
             $model->where('order_time', '>=', $start_time)
@@ -110,7 +110,7 @@ class StatisticsService extends Service
             ->where('order_type',$data['order_type'])
             ->select($field)
             ->orderby('id', 'desc');
-        if(! empty($data['order_time'])){
+        if(! empty($data['order_time'][0]) && ! empty($data['order_time'][1])){
             list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
             if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];
             $model->where('order_time', '>=', $start_time)
@@ -156,7 +156,7 @@ class StatisticsService extends Service
             ->select($field)
             ->groupby('order_id')
             ->orderby('id', 'desc');
-        if(! empty($data['order_time'])){
+        if(! empty($data['order_time'][0]) && ! empty($data['order_time'][1])){
             list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['order_time'],false);
             if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "单据日期的区间无效"];
             $model->where('order_time', '>=', $start_time)

+ 1 - 1
app/Service/TPlusServerService.php

@@ -164,7 +164,7 @@ class TPlusServerService extends Service
      * @return array
      */
     public function synRevenueCost($data, $user){
-        if(empty($data['crt_time']) || ! is_array($data['crt_time'])) return [false, '同步时间不能为空'];
+        if(empty($data['crt_time'][0]) || empty($data['crt_time'][1])) return [false, '同步时间不能为空'];
         list($start_time, $end_time) = $this->changeDateToTimeStampAboutRange($data['crt_time'],false);
         if ($start_time === null || $end_time === null || $start_time > $end_time) return [false, "同步时间:时间区间无效"];
         list($bool, $bool_msg) = $this->isOverThreeMonths($start_time, $end_time);