Преглед изворни кода

up - 高处作业判断+提示

liugc пре 10 месеци
родитељ
комит
ee98d2f001

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

@@ -197,7 +197,7 @@ class MasterWorkerController extends BaseApiController
     {
         $params = request()->get();
         if(in_array($params['credential_type'],[3,52,109,17])){
-            $result = MasterWorkerRegisterLogic::credential($this->userId,'高处作业');
+            $result = MasterWorkerRegisterLogic::credential($this->userId,'高处作业',1);
             if($result){
                 return $this->success('', ['isAltitude'=>$result?1:0], 1, 1);
             }else{

+ 3 - 1
app/workerapi/logic/MasterWorkerRegisterLogic.php

@@ -109,11 +109,12 @@ class MasterWorkerRegisterLogic extends BaseLogic
     /**
      * 获取证件
      */
-    public static function credential($worker_id,$image_name=''): array
+    public static function credential($worker_id,$image_name='',$is_ok = 0): array
     {
         $worker_register_id = MasterWorkerRegister::where('worker_id',$worker_id)->value('id');
         $where[] = ['worker_register_id','=',$worker_register_id];
         $image_name && $where[] = ['image_name','=',$image_name];
+        $is_ok && $where[] = ['audit_state','=',1];
         $list = MasterWorkerCredentialImages::where($where)->select()->toArray();
         foreach ($list as &$item) {
             switch ($item['image_name']){
@@ -167,6 +168,7 @@ class MasterWorkerRegisterLogic extends BaseLogic
             $params['worker_register_id'] && $where[] = ['worker_register_id','=',$params['worker_register_id']];
             $id && $where[] = ['id','=',$params['id']];
             $isAltitude && $where[] = ['image_name','=','高处作业'];
+            $params['image_name'] && $where[] = ['image_name','=',$params['image_name']];
             $credentialImages = MasterWorkerCredentialImages::where($where)->findOrEmpty();
             if($credentialImages->isEmpty()){
                 MasterWorkerCredentialImages::create([