up - 通知

app/adminapi/controller/master_worker/BankAccountController.php

@@ -90,16 +90,11 @@ class BankAccountController extends BaseAdminController
     {
         $params = (new BankAccountValidate())->post()->goCheck('delete');
         try {
-            if (is_array($params['id'])) {
-                foreach ($params['id'] as $id) {
-                    $info = BankAccountLogic::detail(['id'=>$id]);
-                    MasterWorkerExamineLogic::updateEngineerInformation($info['worker_id']);
-                }
-            }else{
-                $info = BankAccountLogic::detail(['id'=>$params['id']]);
-                MasterWorkerExamineLogic::updateEngineerInformation($info['worker_id']);
-            }
+            $worker_ids = BankAccountLogic::getWorkerIds($params);
             BankAccountLogic::delete($params);
+            foreach ($worker_ids as $worker_id) {
+                MasterWorkerExamineLogic::updateEngineerInformation($worker_id);
+            }
             return $this->success('删除成功', [], 1, 1);
         } catch (\Exception $e) {
             return $this->fail('删除失败-'.$e->getMessage());

app/adminapi/controller/master_worker/MasterWorkerAgreeController.php

@@ -91,16 +91,11 @@ class MasterWorkerAgreeController extends BaseAdminController
     {
         $params = (new MasterWorkerAgreeValidate())->post()->goCheck('delete');
         try {
-            if (is_array($params['id'])) {
-                foreach ($params['id'] as $id) {
-                    $info = MasterWorkerAgreeLogic::detail(['id'=>$id]);
-                    MasterWorkerExamineLogic::updateEngineerInformation($info['worker_id']);
-                }
-            }else{
-                $info = MasterWorkerAgreeLogic::detail(['id'=>$params['id']]);
-                MasterWorkerExamineLogic::updateEngineerInformation($info['worker_id']);
-            }
+            $worker_ids = MasterWorkerAgreeLogic::getWorkerIds($params);
             MasterWorkerAgreeLogic::delete($params);
+            foreach ($worker_ids as $worker_id) {
+                MasterWorkerExamineLogic::updateEngineerInformation($worker_id);
+            }
             return $this->success('删除成功', [], 1, 1);
         } catch (\Exception $e) {
             return $this->fail('删除失败-'.$e->getMessage());

app/adminapi/controller/master_worker/MasterWorkerInfoController.php

@@ -90,15 +90,10 @@ class MasterWorkerInfoController extends BaseAdminController
     public function delete()
     {
         $params = (new MasterWorkerInfoValidate())->post()->goCheck('delete');
+        $worker_ids = MasterWorkerInfoLogic::getWorkerIds($params);
         MasterWorkerInfoLogic::delete($params);
-        if (is_array($params['id'])) {
-            foreach ($params['id'] as $id) {
-                $info = MasterWorkerInfoLogic::detail(['id'=>$id]);
-                MasterWorkerExamineLogic::updateEngineerInformation($info['worker_id']);
-            }
-        }else{
-            $info = MasterWorkerInfoLogic::detail(['id'=>$params['id']]);
-            MasterWorkerExamineLogic::updateEngineerInformation($info['worker_id']);
+        foreach ($worker_ids as $worker_id) {
+            MasterWorkerExamineLogic::updateEngineerInformation($worker_id);
         }
         return $this->success('删除成功', [], 1, 1);
     }

app/adminapi/logic/master_worker/BankAccountLogic.php

@@ -121,4 +121,9 @@ class BankAccountLogic extends BaseLogic
     {
         return BankAccount::findOrEmpty($params['id'])->toArray();
     }
+
+    public static function getWorkerIds($params): array
+    {
+        return BankAccount::where('id',is_array($params['id'])?'in':'=',$params['id'])->column('worker_id');
+    }
 }

app/adminapi/logic/master_worker/MasterWorkerAgreeLogic.php

@@ -106,4 +106,10 @@ class MasterWorkerAgreeLogic extends BaseLogic
     {
         return MasterWorkerAgree::findOrEmpty($params['id'])->toArray();
     }
+
+    public static function getWorkerIds($params): array
+    {
+        return MasterWorkerAgree::where('id',is_array($params['id'])?'in':'=',$params['id'])->column('worker_id');
+    }
+
 }

app/adminapi/logic/master_worker/MasterWorkerInfoLogic.php

@@ -117,4 +117,9 @@ class MasterWorkerInfoLogic extends BaseLogic
     {
         return MasterWorkerInfo::findOrEmpty($params['id'])->toArray();
     }
+
+    public static function getWorkerIds($params): array
+    {
+        return MasterWorkerInfo::where('id',is_array($params['id'])?'in':'=',$params['id'])->column('worker_id');
+    }
 }

app/common/logic/MasterWorkerExamineLogic.php

@@ -33,9 +33,12 @@ class MasterWorkerExamineLogic extends BaseLogic
      */
     public static function updateEngineerInformation(int $worker_id): bool
     {
-        Db::startTrans();
+        //Db::startTrans();
         try {
             $resData = MasterWorker::with(['workerInfo','workerAgree','bankAccount'])->where('id', $worker_id)->findOrEmpty()->toArray();
+
+
+
             if(!isset($resData['workerInfo']['id']) || !isset($resData['workerAgree']['id']) || !isset($resData['bankAccount']['id'])) {
                 $audit_state = 3;
             }elseif ((int)$resData['workerInfo']['audit_state'] === 0 || (int)$resData['workerAgree']['audit_state'] === 0 || (int)$resData['bankAccount']['audit_state'] === 0){
@@ -48,8 +51,8 @@ class MasterWorkerExamineLogic extends BaseLogic
             MasterWorker::where('id', $worker_id)->update([
                 'audit_state' => $audit_state,
             ]);
-
-            Db::commit();
+            dd($audit_state,$resData);
+            //Db::commit();
 
             if($audit_state == 1){
                 // 工程师基本信息审核通知【给工程师的通知】
@@ -63,8 +66,9 @@ class MasterWorkerExamineLogic extends BaseLogic
             }
             return true;
         } catch (\Exception $e) {
-            Db::rollback();
+            //Db::rollback();
             self::setError($e->getMessage());
+            dd($e->getMessage());
             return false;
         }
     }