Przeglądaj źródła

up - 审核状态

liugc 1 rok temu
rodzic
commit
6efac85a3e

+ 1 - 1
app/workerapi/controller/TrainingController.php

@@ -29,7 +29,7 @@ class TrainingController extends BaseApiController
      */
     public function getTrainingInfo()
     {
-        $result = TrainingLogic::getDetail($this->userId);
+        $result = TrainingLogic::getDetail(199);
         return $this->data($result);
     }
 

+ 6 - 3
app/workerapi/logic/TrainingLogic.php

@@ -55,14 +55,17 @@ class TrainingLogic extends  BaseLogic
                 // 团队入驻状态 审核状态 0待审核 1审核通过 2审核拒绝
                 $task_info['tenant_register_status'] = TenantRegister::where('mobile',$masterWorker['mobile'])->value('status')??0;
                 // 团队协议状态 审核状态 0待审核 1审核通过 2审核拒绝 3待提交
-                $task_info['tenant_agree_status'] = TenantAgree::where('worker_id',$masterWorker['id'])->value('audit_state')??0;
+                $tenant_agree_status = TenantAgree::where('worker_id',$masterWorker['id'])->value('audit_state');
+                $task_info['tenant_agree_status'] = ($tenant_agree_status==null)?3:$tenant_agree_status;
                 $task_info['tenant_agree_info'] = TenantAgreeLogic::getAgreeByType('tenant_cooperate',$masterWorker['id']);
 
                 // 工程师免责协议状态 审核状态 0待审核 1审核通过 2审核拒绝 3待提交
-                $task_info['harmless_agree_status'] = MasterWorkerAgree::where(['agree_type'=>'harmless_content','worker_id'=>$masterWorker['id']])->value('audit_state')??0;
+                $harmless_agree_status = MasterWorkerAgree::where(['agree_type'=>'harmless_content','worker_id'=>$masterWorker['id']])->value('audit_state');
+                $task_info['harmless_agree_status'] = ($harmless_agree_status==null)?3:$harmless_agree_status;
                 $task_info['harmless_agree_info'] = MasterWorkerAgreeLogic::getAgreeByType('harmless',$masterWorker['id']);
                 // 工程师无犯罪协议状态 审核状态 0待审核 1审核通过 2审核拒绝 3待提交
-                $task_info['crime_agree_status'] = MasterWorkerAgree::where(['agree_type'=>'crime_content','worker_id'=>$masterWorker['id']])->value('audit_state')??0;
+                $crime_agree_status = MasterWorkerAgree::where(['agree_type'=>'crime_content','worker_id'=>$masterWorker['id']])->value('audit_state');
+                $task_info['crime_agree_status'] = ($crime_agree_status==null)?3:$crime_agree_status;
                 $task_info['crime_agree_info'] = MasterWorkerAgreeLogic::getAgreeByType('crime',$masterWorker['id']);
 
                 // 该工程师所有必须任务是否完成