合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !2764

@@ -10,6 +10,7 @@ use App\Http\Requests\Api\WorkOrder\TicketListRequest;
 use App\Http\Requests\Api\WorkOrder\TicketStoreRequest;
 use App\Models\Project\ProcessRecords;
 use App\Models\Project\Project;
+use App\Models\ProjectAssociation\ProjectAssociation;
 use App\Models\WorkOrder\TicketLog;
 use App\Models\WorkOrder\TicketProject;
 use App\Models\WorkOrder\Tickets;
@@ -235,13 +236,9 @@ class TicketController extends BaseController
             }
             //无剩余时间
             if($project['project_type'] == 1){
-                if($project['remain_day'] == 0){
-                    $data['optimize_record'] = 4;
-                }
+                if($project['remain_day'] == 0){$data['optimize_record'] = 4;}
             }else{
-                if($project['seo_remain_day'] == 0){
-                    $data['optimize_record'] = 4;
-                }
+                if($project['seo_remain_day'] == 0){$data['optimize_record'] = 4;}
             }
             if(in_array(2,$project['level'])){
                 $data['date_project_record'] = ['暂停优化'];
@@ -249,6 +246,12 @@ class TicketController extends BaseController
                 $data['date_project_record'] = Project::projectProgress('optimize');
             }
         }else{
+            //查看是否绑定微信群
+            $projectAss = new ProjectAssociation();
+            $count = $projectAss->counts(['project_id'=>$this->param['project_id']]);
+            if(($count > 0) && ($data['project_record'] == 0)){
+                $data['project_record'] = 1;
+            }
             $data['date_project_record'] = Project::projectProgress('build');
         }
         $this->response('success',Code::SUCCESS,$data);

@@ -7,6 +7,7 @@ use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\ProcessRecords;
 use App\Models\Project\Project;
+use App\Models\ProjectAssociation\ProjectAssociation;
 
 class ProcessRecordsLogic extends BaseLogic
 {
@@ -20,6 +21,7 @@ class ProcessRecordsLogic extends BaseLogic
     public function getInfo($project_id)
     {
         $data = $this->model->read(['project_id'=>$project_id]);
+        $info = $data;
         $project = ProjectLogic::instance()->getProjectInfo($project_id);
         if(!$data){
             $data = [
@@ -77,13 +79,9 @@ class ProcessRecordsLogic extends BaseLogic
             }
             //无剩余时间
             if($project['project_type'] == 1){
-                if($project['seo_remain_day'] == 0){
-                    $data['optimize_record'] = 4;
-                }
+                if($project['seo_remain_day'] == 0){$data['optimize_record'] = 4;}
             }else{
-                if($project['remain_day'] == 0){
-                    $data['optimize_record'] = 4;
-                }
+                if($project['remain_day'] == 0){$data['optimize_record'] = 4;}
             }
             if(in_array(2,$project['level'])){
                 $data['date_project_record'] = ['暂停优化'];
@@ -91,6 +89,12 @@ class ProcessRecordsLogic extends BaseLogic
                 $data['date_project_record'] = Project::projectProgress('optimize');
             }
         }else{
+            //查看是否绑定微信群
+            $projectAss = new ProjectAssociation();
+            $count = $projectAss->counts(['project_id'=>$project_id]);
+            if(($count > 0) && ($data['project_record'] == 0)){
+                $data['project_record'] = 1;
+            }
             $data['date_project_record'] = Project::projectProgress('build');
         }
         return $this->success($data);

@@ -2,6 +2,7 @@
 
 namespace App\Models\ProjectAssociation;
 
+use App\Models\Base;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
@@ -38,7 +39,7 @@ use Illuminate\Database\Eloquent\Model;
  * @method  Builder|ProjectAssociation whereUserName($value)
  * @mixin \Eloquent
  */
-class ProjectAssociation extends Model
+class ProjectAssociation extends Base
 {
 
     protected $table = 'gl_project_association';