add - 实习培训任务关联绑定

app/adminapi/controller/master_worker/MasterWorkerController.php

@@ -128,10 +128,6 @@ class MasterWorkerController extends BaseAdminController
     public function getAllWorkers()
     {
         $params = (new MasterWorkerValidate())->get();
-        $result = MasterWorkerLogic::getAllWorkers($params);
-        if (false === $result) {
-            return $this->fail(MasterWorkerLogic::getError());
-        }
-        return $this->data($result);
+        return $this->data(MasterWorkerLogic::getAllWorkers($params));
     }
 }

app/adminapi/controller/training/TrainingWorkerTaskController.php

@@ -0,0 +1,108 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+
+namespace app\adminapi\controller\training;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\training\TrainingWorkerTaskLists;
+use app\adminapi\logic\training\TrainingWorkerTaskLogic;
+use app\adminapi\validate\training\TrainingWorkerTaskValidate;
+
+
+/**
+ * TrainingWorkerTask控制器
+ * Class TrainingWorkerTaskController
+ * @package app\adminapi\controller
+ */
+class TrainingWorkerTaskController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function lists()
+    {
+        return $this->dataLists(new TrainingWorkerTaskLists());
+    }
+
+
+    /**
+     * @notes 添加
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function add()
+    {
+        $params = (new TrainingWorkerTaskValidate())->post()->goCheck('add');
+        $result = TrainingWorkerTaskLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(TrainingWorkerTaskLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function edit()
+    {
+        $params = (new TrainingWorkerTaskValidate())->post()->goCheck('edit');
+        $result = TrainingWorkerTaskLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(TrainingWorkerTaskLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function delete()
+    {
+        $params = (new TrainingWorkerTaskValidate())->post()->goCheck('delete');
+        TrainingWorkerTaskLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function detail()
+    {
+        $params = (new TrainingWorkerTaskValidate())->goCheck('detail');
+        $result = TrainingWorkerTaskLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/lists/training/TrainingCourseLists.php

@@ -38,8 +38,8 @@ class TrainingCourseLists extends BaseAdminDataLists implements ListsSearchInter
     public function setSearch(): array
     {
         return [
-            '=' => ['course_name', 'course_picture', 'course_url', 'course_lock', 'course_length', 'course_question_setting', 'course_question_score'],
-
+            '=' => ['course_picture', 'course_url', 'course_lock', 'course_length', 'course_question_setting', 'course_question_score'],
+            '%like%' => ['course_name'],
         ];
     }
 

app/adminapi/lists/training/TrainingQuestionsLists.php

@@ -38,8 +38,8 @@ class TrainingQuestionsLists extends BaseAdminDataLists implements ListsSearchIn
     public function setSearch(): array
     {
         return [
-            '=' => ['training_course_id', 'title', 'question_type', 'question_selects', 'question_answer', 'question_analysis'],
-
+            '=' => ['training_course_id', 'question_type', 'question_selects', 'question_answer', 'question_analysis'],
+            '%like%' => ['title'],
         ];
     }
 

app/adminapi/lists/training/TrainingTaskLists.php

@@ -38,8 +38,8 @@ class TrainingTaskLists extends BaseAdminDataLists implements ListsSearchInterfa
     public function setSearch(): array
     {
         return [
-            '=' => ['task_name', 'training_course_id', 'shop_goods_id'],
-
+            '=' => ['training_course_id'],
+            '%like%' => ['task_name'],
         ];
     }
 
@@ -56,7 +56,7 @@ class TrainingTaskLists extends BaseAdminDataLists implements ListsSearchInterfa
     public function lists(): array
     {
         return TrainingTask::where($this->searchWhere)
-            ->field(['id', 'task_name', 'training_course_id', 'shop_goods_id'])
+            ->field(['id', 'task_name', 'training_course_id'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()

app/adminapi/lists/training/TrainingWorkerTaskLists.php

@@ -0,0 +1,84 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\lists\training;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\training\TrainingWorkerTask;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * TrainingWorkerTask列表
+ * Class TrainingWorkerTaskLists
+ * @package app\adminapi\lists
+ */
+class TrainingWorkerTaskLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['master_worker_id', 'shop_goods_id', 'shop_orders_id', 'training_task_id', 'training_status', 'lead_master_worker_id', 'operate_status'],
+
+        ];
+    }
+
+
+    /**
+     * @notes 获取列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function lists(): array
+    {
+        return TrainingWorkerTask::with([
+                'TrainingTask',
+                'MasterWorker',
+                'LeadMasterWorker',
+                'ShopGoods',
+                'ShopOrders',
+            ])->where($this->searchWhere)
+            ->field(['id', 'master_worker_id', 'shop_goods_id', 'shop_orders_id', 'training_task_id', 'training_status', 'lead_master_worker_id', 'operate_status'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取数量
+     * @return int
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function count(): int
+    {
+        return TrainingWorkerTask::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -215,14 +215,14 @@ class MasterWorkerLogic extends BaseLogic
     /**
      * 获取所有工程师选项列表
      * @param $params
-     * @return false|string
+     * @return array
      */
     public static function getAllWorkers($params){
         try{
-            return MasterWorker::where(['is_disable'=>0])->column('id,id as value,worker_number as name,account,mobile');
+            return MasterWorker::where(['is_disable'=>0])->column('id,id as value,worker_number as name,real_name,account,mobile');
         } catch (\Exception $e){
             self::setError($e->getMessage());
-            return false;
+            return [];
         }
 
     }

app/adminapi/logic/training/TrainingCourseLogic.php

@@ -46,7 +46,7 @@ class TrainingCourseLogic extends BaseLogic
                 'course_url' => $params['course_url'],
                 'course_lock' => $params['course_lock'],
                 'course_length' => $params['course_length'],
-                'course_question_setting' => $params['course_question_setting'],
+                'course_question_setting' => self::configureReservedField($params['course_question_setting']??[]),
                 'course_question_score' => $params['course_question_score'],
             ]);
 
@@ -77,7 +77,7 @@ class TrainingCourseLogic extends BaseLogic
                 'course_url' => $params['course_url'],
                 'course_lock' => $params['course_lock'],
                 'course_length' => $params['course_length'],
-                'course_question_setting' => $params['course_question_setting'],
+                'course_question_setting' => json_encode(self::configureReservedField($params['course_question_setting']??[])),
                 'course_question_score' => $params['course_question_score'],
             ]);
 
@@ -115,4 +115,13 @@ class TrainingCourseLogic extends BaseLogic
     {
         return TrainingCourse::findOrEmpty($params['id'])->toArray();
     }
+
+    public static function configureReservedField($data): array
+    {
+        foreach ($data as $key => &$item) {
+            $data[$key]['block_key'] = $key+1;
+            $item['select_value'] = (int)$item['select_value'];
+        }
+        return $data??[];
+    }
 }

app/adminapi/logic/training/TrainingTaskLogic.php

@@ -42,8 +42,7 @@ class TrainingTaskLogic extends BaseLogic
         try {
             TrainingTask::create([
                 'task_name' => $params['task_name'],
-                'training_course_id' => $params['training_course_id'],
-                'shop_goods_id' => $params['shop_goods_id'],
+                'training_course_id' => array_map('intval', $params['training_course_id'])
             ]);
 
             Db::commit();
@@ -69,8 +68,7 @@ class TrainingTaskLogic extends BaseLogic
         try {
             TrainingTask::where('id', $params['id'])->update([
                 'task_name' => $params['task_name'],
-                'training_course_id' => $params['training_course_id'],
-                'shop_goods_id' => $params['shop_goods_id'],
+                'training_course_id' => json_encode(array_map('intval', $params['training_course_id']))
             ]);
 
             Db::commit();

app/adminapi/logic/training/TrainingWorkerTaskLogic.php

@@ -0,0 +1,112 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\logic\training;
+
+
+use app\common\model\training\TrainingWorkerTask;
+use app\common\logic\BaseLogic;
+use think\facade\Db;
+
+
+/**
+ * TrainingWorkerTask逻辑
+ * Class TrainingWorkerTaskLogic
+ * @package app\adminapi\logic
+ */
+class TrainingWorkerTaskLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            TrainingWorkerTask::create([
+                'master_worker_id' => $params['master_worker_id'],
+                'shop_goods_id' => $params['shop_goods_id'],
+                'training_task_id' => $params['training_task_id'],
+                'lead_master_worker_id' => $params['lead_master_worker_id'],
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 编辑
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public static function edit(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            TrainingWorkerTask::where('id', $params['id'])->update([
+                'master_worker_id' => $params['master_worker_id'],
+                'shop_goods_id' => $params['shop_goods_id'],
+                'training_task_id' => $params['training_task_id'],
+                'lead_master_worker_id' => $params['lead_master_worker_id'],
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 删除
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public static function delete(array $params): bool
+    {
+        return TrainingWorkerTask::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取详情
+     * @param $params
+     * @return array
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public static function detail($params): array
+    {
+        return TrainingWorkerTask::findOrEmpty($params['id'])->toArray();
+    }
+}

app/adminapi/validate/training/TrainingCourseValidate.php

@@ -68,7 +68,7 @@ class TrainingCourseValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['course_name','course_picture','course_url','course_lock','course_length','course_question_setting','course_question_score']);
+        return $this->only(['course_name','course_picture','course_url','course_lock','course_question_setting','course_question_score']);
     }
 
 
@@ -80,7 +80,7 @@ class TrainingCourseValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id','course_name','course_picture','course_url','course_lock','course_length','course_question_setting','course_question_score']);
+        return $this->only(['id','course_name','course_picture','course_url','course_lock','course_question_setting','course_question_score']);
     }
 
 

app/adminapi/validate/training/TrainingTaskValidate.php

@@ -33,9 +33,7 @@ class TrainingTaskValidate extends BaseValidate
     protected $rule = [
         'id' => 'require',
         'task_name' => 'require',
-        'training_course_id' => 'require',
-        'shop_goods_id' => 'require',
-
+        'training_course_id' => 'require'
     ];
 
 
@@ -46,8 +44,7 @@ class TrainingTaskValidate extends BaseValidate
     protected $field = [
         'id' => 'id',
         'task_name' => '名称',
-        'training_course_id' => '课程id(逗号拼接)',
-        'shop_goods_id' => '商品id(套餐)',
+        'training_course_id' => '课程id(逗号拼接)'
 
     ];
 
@@ -60,7 +57,7 @@ class TrainingTaskValidate extends BaseValidate
      */
     public function sceneAdd()
     {
-        return $this->only(['task_name','training_course_id','shop_goods_id']);
+        return $this->only(['task_name','training_course_id']);
     }
 
 
@@ -72,7 +69,7 @@ class TrainingTaskValidate extends BaseValidate
      */
     public function sceneEdit()
     {
-        return $this->only(['id','task_name','training_course_id','shop_goods_id']);
+        return $this->only(['id','task_name','training_course_id']);
     }
 
 

app/adminapi/validate/training/TrainingWorkerTaskValidate.php

@@ -0,0 +1,110 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\validate\training;
+
+
+use app\common\validate\BaseValidate;
+
+
+/**
+ * TrainingWorkerTask验证器
+ * Class TrainingWorkerTaskValidate
+ * @package app\adminapi\validate
+ */
+class TrainingWorkerTaskValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+    protected $rule = [
+        'id' => 'require',
+        'master_worker_id' => 'require',
+        'shop_goods_id' => 'require',
+        'shop_orders_id' => 'require',
+        'training_task_id' => 'require',
+        'training_status' => 'require',
+        'lead_master_worker_id' => 'require',
+        'operate_status' => 'require',
+
+    ];
+
+
+    /**
+     * 参数描述
+     * @var string[]
+     */
+    protected $field = [
+        'id' => 'id',
+        'master_worker_id' => '师傅id',
+        'shop_goods_id' => '商品id(套餐)',
+        'shop_orders_id' => '购买单号id',
+        'training_task_id' => '培训任务ID',
+        'training_status' => '培训状态',
+        'lead_master_worker_id' => '带徒师傅id',
+        'operate_status' => '实操状态',
+
+    ];
+
+
+    /**
+     * @notes 添加场景
+     * @return TrainingWorkerTaskValidate
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function sceneAdd()
+    {
+        return $this->only(['master_worker_id','shop_goods_id','training_task_id','lead_master_worker_id']);
+    }
+
+
+    /**
+     * @notes 编辑场景
+     * @return TrainingWorkerTaskValidate
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function sceneEdit()
+    {
+        return $this->only(['id','master_worker_id','shop_goods_id','training_task_id','lead_master_worker_id']);
+    }
+
+
+    /**
+     * @notes 删除场景
+     * @return TrainingWorkerTaskValidate
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function sceneDelete()
+    {
+        return $this->only(['id']);
+    }
+
+
+    /**
+     * @notes 详情场景
+     * @return TrainingWorkerTaskValidate
+     * @author likeadmin
+     * @date 2025/02/16 13:49
+     */
+    public function sceneDetail()
+    {
+        return $this->only(['id']);
+    }
+
+}

app/common/logic/TableDataLogic.php

@@ -29,6 +29,10 @@ use app\common\model\refund\RefundRecord;
 use app\common\model\sale\Sale;
 use app\common\model\sale\SaleGroup;
 use app\common\model\setting\PostageRegion;
+use app\common\model\shops\ShopGoods;
+use app\common\model\training\TrainingCourse;
+use app\common\model\training\TrainingQuestions;
+use app\common\model\training\TrainingTask;
 use app\common\service\pay\AliPayService;
 use app\common\service\pay\WeChatPayService;
 
@@ -131,4 +135,21 @@ class TableDataLogic extends BaseLogic
         return Admin::where('disable','=',0)->field('id,name,id as value,"data_table_admins" as type_value')->select()->toArray();
     }
 
+    public static function trainingQuestions()
+    {
+        return TrainingQuestions::field('id,title as name,id as value,question_type,"data_table_trainingQuestions" as type_value')->select()->toArray();
+    }
+    public static function trainingCourse()
+    {
+        return TrainingCourse::field('id,course_name as name,id as value,"data_table_trainingCourse" as type_value')->select()->toArray();
+    }
+    public static function trainingTask()
+    {
+        return TrainingTask::field('id,task_name as name,id as value,"data_table_trainingTask" as type_value')->select()->toArray();
+    }
+    public static function shopGoods()
+    {
+        return ShopGoods::field('id,goods_name as name,id as value,"data_table_shopGoods" as type_value')->select()->toArray();
+    }
+
 }

app/common/model/training/TrainingCourse.php

@@ -28,7 +28,9 @@ class TrainingCourse extends BaseModel
 {
     
     protected $name = 'training_course';
-    
+    protected $type = [
+        'course_question_setting' => 'array',
+    ];
 
     
 }

app/common/model/training/TrainingTask.php

@@ -28,7 +28,9 @@ class TrainingTask extends BaseModel
 {
     
     protected $name = 'training_task';
-    
+    protected $type = [
+        'training_course_id' => 'array',
+    ];
 
     
 }

app/common/model/training/TrainingWorkerTask.php

@@ -0,0 +1,49 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\common\model\training;
+
+
+use app\common\model\BaseModel;
+use app\common\model\master_worker\MasterWorker;
+use app\common\model\shops\ShopGoods;
+use app\common\model\shops\ShopOrders;
+
+
+/**
+ * TrainingWorkerTask模型
+ * Class TrainingWorkerTask
+ * @package app\common\model
+ */
+class TrainingWorkerTask extends BaseModel
+{
+    
+    protected $name = 'training_worker_task';
+    public function TrainingTask(){
+        return $this->hasOne(TrainingTask::class,'id','training_task_id');
+    }
+    public function MasterWorker(){
+        return $this->hasOne(MasterWorker::class,'id','master_worker_id');
+    }
+    public function LeadMasterWorker(){
+        return $this->hasOne(MasterWorker::class,'id','lead_master_worker_id');
+    }
+    public function ShopGoods(){
+        return $this->hasOne(ShopGoods::class,'id','shop_goods_id');
+    }
+    public function ShopOrders(){
+        return $this->hasOne(ShopOrders::class,'id','shop_orders_id');
+    }
+    
+}