up - 工程师课程

app/adminapi/logic/training/TrainingBlockConfigLogic.php

@@ -118,4 +118,11 @@ class TrainingBlockConfigLogic extends BaseLogic
         return ($type==='all')?$settings:$settings[$type];
     }
 
+    public static function getRequiredConfig($identity_source)
+    {
+        $block_setting = TrainingBlockConfig::where('identity_source',$identity_source)->value('block_setting');
+        return json_decode($block_setting,true);
+    }
+
+
 }

app/adminapi/logic/training/TrainingWorkerTaskLogic.php

@@ -126,7 +126,7 @@ class TrainingWorkerTaskLogic extends BaseLogic
      */
     public static function trainingCourseRecord($masterWorkerId,$training_task_id): array
     {
-        $ids = TrainingWorkerCourse::where('training_task_id',$training_task_id)->column('id');
+        $ids = TrainingWorkerCourse::where('master_worker_id',$masterWorkerId)->where('training_task_id',$training_task_id)->column('id');
         if(count($ids)>0){
             return $ids;
         }

app/workerapi/logic/MasterWorkerLogic.php

@@ -222,9 +222,20 @@ class MasterWorkerLogic extends  BaseLogic
     }
 
 
-    public static function taskRequiredOk($userId): bool
+    public static function taskRequiredOk($userId,$identity_source): bool
     {
 
+        /*[{"block_key":1,"type":"shop_goods_id","type_value":1,"res_name":"operate_status","execute_function":"operateStatus","is_must":true},
+        {"block_key":2,"type":"training_task_id","type_value":1,"res_name":"operate_status","execute_function":"operateStatus","is_must":true},
+        {"block_key":3,"type":"task_list","type_value":["1","2","4"],"res_name":"operate_status","execute_function":"operateStatus","is_must":true}]
+        $taskList = TrainingTask::where(['worker_id'=>$userId])->select('block_key','type','type_value')->toArray();
+        foreach ( as $item) {
+
+        }*/
+
+
+
+
         return true;
     }