合并分支 'zhl' 到 'master'

Zhl



查看合并请求 !2850

@@ -789,6 +789,8 @@ class ProjectController extends BaseController
         $company = $this->param['company'] ?? '';
         $company = $this->param['company'] ?? '';
         $order_by_field =  $request->input('order_by_field', 'id');
         $order_by_field =  $request->input('order_by_field', 'id');
         $order_by_sort =  $request->input('order_by_sort', 'desc');
         $order_by_sort =  $request->input('order_by_sort', 'desc');
+        $start_time = $this->param['start_time'] ?? '';
+        $end_time = $this->param['end'] ?? '';
 
 
         if(!$source_id && !$id){
         if(!$source_id && !$id){
             $this->response('参数异常',Code::SYSTEM_ERROR);
             $this->response('参数异常',Code::SYSTEM_ERROR);
@@ -815,7 +817,7 @@ class ProjectController extends BaseController
 
 
         $data = Project::with(['deploy_build', 'deploy_optimize', 'online_check'])
         $data = Project::with(['deploy_build', 'deploy_optimize', 'online_check'])
             ->where('delete_status', 0)
             ->where('delete_status', 0)
-            ->where(function ($query) use ($channel_id, $type, $company, $id, $notice_order_id){
+            ->where(function ($query) use ($channel_id, $type, $company, $id, $notice_order_id, $start_time, $end_time){
             if ($channel_id) {
             if ($channel_id) {
                 $query->where('channel->channel_id', $channel_id);
                 $query->where('channel->channel_id', $channel_id);
             }
             }
@@ -831,6 +833,9 @@ class ProjectController extends BaseController
             if ($notice_order_id) {
             if ($notice_order_id) {
                 $query->whereIn('notice_order_id', $notice_order_id);
                 $query->whereIn('notice_order_id', $notice_order_id);
             }
             }
+            if ($start_time && $end_time ) {
+                $query->whereBetween('uptime', [$start_time, $end_time]);
+            }
         })->orderBy($order_by_field, $order_by_sort)->paginate($size)->toArray();
         })->orderBy($order_by_field, $order_by_sort)->paginate($size)->toArray();
         $list = [];
         $list = [];
         foreach ($data['list'] as $item){
         foreach ($data['list'] as $item){

@@ -117,6 +117,34 @@ class InquiryFormData extends Base
         return $model->id;
         return $model->id;
     }
     }
 
 
+    /**
+     * 特殊项目 邮件模版
+     * FIXME 后期有多个特殊项目，需要按照项目ID设置模板
+     * @param $name
+     * @param $email
+     * @param $phone
+     * @param $message
+     * @param $domain
+     * @param $country
+     * @return string
+     */
+    public static function specialInquiryTemplate($name, $email, $phone, $message, $domain, $country)
+    {
+        $template = "
+客户姓名：$name
+客户邮箱：$email
+客户电话：$phone
+--------------------------------------------------------------------
+询盘内容：
+$message
+--------------------------------------------------------------------
+发送询盘网址: $domain
+客户IP地址: [ip]
+IP所在国家/地区: $country
+--------------------------------------------------------------------";
+        return $template;
+    }
+
     public function setDataAttribute($value)
     public function setDataAttribute($value)
     {
     {
         $this->attributes['data'] = json_encode($value);
         $this->attributes['data'] = json_encode($value);