1

app/api/controller/Education.php

@@ -279,5 +279,9 @@ class Education
 //        }
         return app('json')->success($data);
     }
+    public function ContractTemplatEnd(){
+
+    }
+
 
 }

app/api/controller/User.php

@@ -1311,7 +1311,7 @@ class User extends BaseController
         }
 //        $post['content'] = $post['content'];
         $post['start_time'] = strtotime($post['start_time']);
-        $post['end_time'] = strtotime($post['end_time']);
+        $post['end_time'] = strtotime($post['end_time'] . ' 23:59:59');
         $start = (new UserContractRecordModel)->where('to_uid', $post['to_uid'])->where('status', 1)->whereBetween('start_time', [$post['start_time'], $post['end_time']])->find();
         $end = (new UserContractRecordModel)->where('to_uid', $post['to_uid'])->where('status', 1)->whereBetween('end_time', [$post['start_time'], $post['end_time']])->find();
 //        $start2=(new UserContractRecordModel)->where('to_uid',$post['to_uid'])->where('status',0)->whereBetween('start_time',[$post['start_time'],$post['end_time']])->find();