作者 lyh

gx

@@ -461,7 +461,7 @@ class ProjectController extends BaseController @@ -461,7 +461,7 @@ class ProjectController extends BaseController
461 'status.required' => '请选择审核状态', 461 'status.required' => '请选择审核状态',
462 'status.in' => '审核状态值无效', 462 'status.in' => '审核状态值无效',
463 ]); 463 ]);
464 - $logic->onlineCheck($this->param); 464 + $logic->onlineCheck();
465 $this->response('success'); 465 $this->response('success');
466 } 466 }
467 467
@@ -17,32 +17,43 @@ class OnlineCheckLogic extends BaseLogic @@ -17,32 +17,43 @@ class OnlineCheckLogic extends BaseLogic
17 $this->model = new OnlineCheck(); 17 $this->model = new OnlineCheck();
18 } 18 }
19 19
20 -  
21 - public function onlineCheck($param){  
22 - $info = $this->model->where('project_id', $param['id'])->first();  
23 - if(!$info){ 20 + /**
  21 + * @remark :用户审核
  22 + * @name :onlineCheck
  23 + * @author :lyh
  24 + * @method :post
  25 + * @time :2023/9/22 11:01
  26 + */
  27 + public function onlineCheck(){
  28 + $info = $this->model->read(['project_id'=>$this->param['id']]);
  29 + if($info === false){
24 $this->fail('项目未提交审核'); 30 $this->fail('项目未提交审核');
25 } 31 }
26 //查看当前用户是否有权限审核 32 //查看当前用户是否有权限审核
27 - if($param['type'] == 'optimist'){ 33 + if($this->param['type'] == 'optimist'){
28 if($info['optimist_mid'] != $this->manager['id']){ 34 if($info['optimist_mid'] != $this->manager['id']){
29 $this->fail('你无权限提交审核'); 35 $this->fail('你无权限提交审核');
30 } 36 }
31 }else{ 37 }else{
  38 + //查看当前优化师是否审核
  39 + if($info['optimist_status'] != 1){
  40 + $this->fail('请先优化师审核');
  41 + }
32 if($info['qa_mid'] != $this->manager['id']){ 42 if($info['qa_mid'] != $this->manager['id']){
33 $this->fail('你无权限提交审核'); 43 $this->fail('你无权限提交审核');
34 } 44 }
  45 + if(isset($this->param['project_type']) && !empty($this->param['project_type'])){
  46 + $projectModel = new Project();
  47 + $projectModel->edit(['type'=>$this->param['project_type']],['id'=>$this->param['id']]);
  48 + }
35 } 49 }
36 $data = [ 50 $data = [
37 - 'project_id' => $param['id'],  
38 - $param['type'] . '_mid' => $this->manager['id'],  
39 - $param['type'] . '_check_time' => date('Y-m-d H:i:s'),  
40 - $param['type'] . '_status' => $param['status'], 51 + $this->param['type'] . '_mid' => $this->manager['id'],
  52 + $this->param['type'] . '_check_time' => date('Y-m-d H:i:s'),
  53 + $this->param['type'] . '_status' => $this->param['status'],
41 'remark' => $param['remark'] ??'', 54 'remark' => $param['remark'] ??'',
42 ]; 55 ];
43 -  
44 - $data['id'] = $info['id'];  
45 - return $this->save($data); 56 + return $this->model->edit($data,['id'=>$info['id']]);
46 } 57 }
47 58
48 /** 59 /**
@@ -56,7 +67,7 @@ class OnlineCheckLogic extends BaseLogic @@ -56,7 +67,7 @@ class OnlineCheckLogic extends BaseLogic
56 $info = $this->model->read(['project_id'=>$this->param['id']]); 67 $info = $this->model->read(['project_id'=>$this->param['id']]);
57 $projectModel = new Project(); 68 $projectModel = new Project();
58 if($info !== false){ 69 if($info !== false){
59 - $this->model->edit($this->param,['id'=>$info['id']]); 70 + $this->fail('已提交,请勿重复提交');
60 }else{ 71 }else{
61 //组装数据 72 //组装数据
62 $data = [ 73 $data = [
@@ -203,23 +203,15 @@ class ProjectLogic extends BaseLogic @@ -203,23 +203,15 @@ class ProjectLogic extends BaseLogic
203 $deployOptimizeModel = new DeployOptimize(); 203 $deployOptimizeModel = new DeployOptimize();
204 if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){ 204 if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){
205 //更改域名 205 //更改域名
206 - if(isset($deploy_optimize['domain']) && !empty($deploy_optimize['domain'])){  
207 - $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);  
208 - }  
209 - }  
210 - if(isset($deploy_optimize['minor_languages']) && !empty($deploy_optimize['minor_languages'])){  
211 - $deploy_optimize['minor_languages'] = Arr::a2s($deploy_optimize['minor_languages']);  
212 - }  
213 - if(isset($deploy_optimize['minor_keywords']) && !empty($deploy_optimize['minor_keywords'])){  
214 - $deploy_optimize['minor_keywords'] = Arr::a2s($deploy_optimize['minor_keywords']); 206 + $this->editDomainStatus($deploy_optimize['domain'],$deploy_optimize['project_id']);
215 } 207 }
216 - 208 + $deploy_optimize['minor_languages'] = Arr::a2s(!empty($deploy_optimize['minor_languages']) ?? []);
  209 + $deploy_optimize['minor_keywords'] = Arr::a2s(!empty($deploy_optimize['minor_keywords']) ?? []);
217 //是否更新了api_no 210 //是否更新了api_no
218 $api_no = DeployOptimize::where('id', $deploy_optimize['id'])->value('api_no'); 211 $api_no = DeployOptimize::where('id', $deploy_optimize['id'])->value('api_no');
219 if($api_no != $deploy_optimize['api_no']){ 212 if($api_no != $deploy_optimize['api_no']){
220 NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, ['api_no' => $deploy_optimize['api_no']]); 213 NoticeLog::createLog(NoticeLog::TYPE_RANK_DATA, ['api_no' => $deploy_optimize['api_no']]);
221 } 214 }
222 -  
223 $deployOptimizeModel->edit($deploy_optimize,['id'=>$deploy_optimize['id']]); 215 $deployOptimizeModel->edit($deploy_optimize,['id'=>$deploy_optimize['id']]);
224 return $this->success(); 216 return $this->success();
225 } 217 }