正在显示
3 个修改的文件
包含
21 行增加
和
13 行删除
| @@ -10,6 +10,7 @@ use App\Http\Requests\Api\WorkOrder\TicketListRequest; | @@ -10,6 +10,7 @@ use App\Http\Requests\Api\WorkOrder\TicketListRequest; | ||
| 10 | use App\Http\Requests\Api\WorkOrder\TicketStoreRequest; | 10 | use App\Http\Requests\Api\WorkOrder\TicketStoreRequest; |
| 11 | use App\Models\Project\ProcessRecords; | 11 | use App\Models\Project\ProcessRecords; |
| 12 | use App\Models\Project\Project; | 12 | use App\Models\Project\Project; |
| 13 | +use App\Models\ProjectAssociation\ProjectAssociation; | ||
| 13 | use App\Models\WorkOrder\TicketLog; | 14 | use App\Models\WorkOrder\TicketLog; |
| 14 | use App\Models\WorkOrder\TicketProject; | 15 | use App\Models\WorkOrder\TicketProject; |
| 15 | use App\Models\WorkOrder\Tickets; | 16 | use App\Models\WorkOrder\Tickets; |
| @@ -235,13 +236,9 @@ class TicketController extends BaseController | @@ -235,13 +236,9 @@ class TicketController extends BaseController | ||
| 235 | } | 236 | } |
| 236 | //无剩余时间 | 237 | //无剩余时间 |
| 237 | if($project['project_type'] == 1){ | 238 | if($project['project_type'] == 1){ |
| 238 | - if($project['remain_day'] == 0){ | ||
| 239 | - $data['optimize_record'] = 4; | ||
| 240 | - } | 239 | + if($project['remain_day'] == 0){$data['optimize_record'] = 4;} |
| 241 | }else{ | 240 | }else{ |
| 242 | - if($project['seo_remain_day'] == 0){ | ||
| 243 | - $data['optimize_record'] = 4; | ||
| 244 | - } | 241 | + if($project['seo_remain_day'] == 0){$data['optimize_record'] = 4;} |
| 245 | } | 242 | } |
| 246 | if(in_array(2,$project['level'])){ | 243 | if(in_array(2,$project['level'])){ |
| 247 | $data['date_project_record'] = ['暂停优化']; | 244 | $data['date_project_record'] = ['暂停优化']; |
| @@ -249,6 +246,12 @@ class TicketController extends BaseController | @@ -249,6 +246,12 @@ class TicketController extends BaseController | ||
| 249 | $data['date_project_record'] = Project::projectProgress('optimize'); | 246 | $data['date_project_record'] = Project::projectProgress('optimize'); |
| 250 | } | 247 | } |
| 251 | }else{ | 248 | }else{ |
| 249 | + //查看是否绑定微信群 | ||
| 250 | + $projectAss = new ProjectAssociation(); | ||
| 251 | + $count = $projectAss->counts(['project_id'=>$this->param['project_id']]); | ||
| 252 | + if(($count > 0) && ($data['project_record'] == 0)){ | ||
| 253 | + $data['project_record'] = 1; | ||
| 254 | + } | ||
| 252 | $data['date_project_record'] = Project::projectProgress('build'); | 255 | $data['date_project_record'] = Project::projectProgress('build'); |
| 253 | } | 256 | } |
| 254 | $this->response('success',Code::SUCCESS,$data); | 257 | $this->response('success',Code::SUCCESS,$data); |
| @@ -7,6 +7,7 @@ use App\Http\Logic\Aside\BaseLogic; | @@ -7,6 +7,7 @@ use App\Http\Logic\Aside\BaseLogic; | ||
| 7 | use App\Models\Domain\DomainInfo; | 7 | use App\Models\Domain\DomainInfo; |
| 8 | use App\Models\Project\ProcessRecords; | 8 | use App\Models\Project\ProcessRecords; |
| 9 | use App\Models\Project\Project; | 9 | use App\Models\Project\Project; |
| 10 | +use App\Models\ProjectAssociation\ProjectAssociation; | ||
| 10 | 11 | ||
| 11 | class ProcessRecordsLogic extends BaseLogic | 12 | class ProcessRecordsLogic extends BaseLogic |
| 12 | { | 13 | { |
| @@ -20,6 +21,7 @@ class ProcessRecordsLogic extends BaseLogic | @@ -20,6 +21,7 @@ class ProcessRecordsLogic extends BaseLogic | ||
| 20 | public function getInfo($project_id) | 21 | public function getInfo($project_id) |
| 21 | { | 22 | { |
| 22 | $data = $this->model->read(['project_id'=>$project_id]); | 23 | $data = $this->model->read(['project_id'=>$project_id]); |
| 24 | + $info = $data; | ||
| 23 | $project = ProjectLogic::instance()->getProjectInfo($project_id); | 25 | $project = ProjectLogic::instance()->getProjectInfo($project_id); |
| 24 | if(!$data){ | 26 | if(!$data){ |
| 25 | $data = [ | 27 | $data = [ |
| @@ -77,13 +79,9 @@ class ProcessRecordsLogic extends BaseLogic | @@ -77,13 +79,9 @@ class ProcessRecordsLogic extends BaseLogic | ||
| 77 | } | 79 | } |
| 78 | //无剩余时间 | 80 | //无剩余时间 |
| 79 | if($project['project_type'] == 1){ | 81 | if($project['project_type'] == 1){ |
| 80 | - if($project['seo_remain_day'] == 0){ | ||
| 81 | - $data['optimize_record'] = 4; | ||
| 82 | - } | 82 | + if($project['seo_remain_day'] == 0){$data['optimize_record'] = 4;} |
| 83 | }else{ | 83 | }else{ |
| 84 | - if($project['remain_day'] == 0){ | ||
| 85 | - $data['optimize_record'] = 4; | ||
| 86 | - } | 84 | + if($project['remain_day'] == 0){$data['optimize_record'] = 4;} |
| 87 | } | 85 | } |
| 88 | if(in_array(2,$project['level'])){ | 86 | if(in_array(2,$project['level'])){ |
| 89 | $data['date_project_record'] = ['暂停优化']; | 87 | $data['date_project_record'] = ['暂停优化']; |
| @@ -91,6 +89,12 @@ class ProcessRecordsLogic extends BaseLogic | @@ -91,6 +89,12 @@ class ProcessRecordsLogic extends BaseLogic | ||
| 91 | $data['date_project_record'] = Project::projectProgress('optimize'); | 89 | $data['date_project_record'] = Project::projectProgress('optimize'); |
| 92 | } | 90 | } |
| 93 | }else{ | 91 | }else{ |
| 92 | + //查看是否绑定微信群 | ||
| 93 | + $projectAss = new ProjectAssociation(); | ||
| 94 | + $count = $projectAss->counts(['project_id'=>$project_id]); | ||
| 95 | + if(($count > 0) && ($data['project_record'] == 0)){ | ||
| 96 | + $data['project_record'] = 1; | ||
| 97 | + } | ||
| 94 | $data['date_project_record'] = Project::projectProgress('build'); | 98 | $data['date_project_record'] = Project::projectProgress('build'); |
| 95 | } | 99 | } |
| 96 | return $this->success($data); | 100 | return $this->success($data); |
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | namespace App\Models\ProjectAssociation; | 3 | namespace App\Models\ProjectAssociation; |
| 4 | 4 | ||
| 5 | +use App\Models\Base; | ||
| 5 | use Illuminate\Database\Eloquent\Builder; | 6 | use Illuminate\Database\Eloquent\Builder; |
| 6 | use Illuminate\Database\Eloquent\Model; | 7 | use Illuminate\Database\Eloquent\Model; |
| 7 | 8 | ||
| @@ -38,7 +39,7 @@ use Illuminate\Database\Eloquent\Model; | @@ -38,7 +39,7 @@ use Illuminate\Database\Eloquent\Model; | ||
| 38 | * @method Builder|ProjectAssociation whereUserName($value) | 39 | * @method Builder|ProjectAssociation whereUserName($value) |
| 39 | * @mixin \Eloquent | 40 | * @mixin \Eloquent |
| 40 | */ | 41 | */ |
| 41 | -class ProjectAssociation extends Model | 42 | +class ProjectAssociation extends Base |
| 42 | { | 43 | { |
| 43 | 44 | ||
| 44 | protected $table = 'gl_project_association'; | 45 | protected $table = 'gl_project_association'; |
-
请 注册 或 登录 后发表评论