From a1f617267249095262bd4cda80d3c425273af848 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 16 Aug 2023 14:56:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/task_template/TaskTemplateLists.php | 9 ++++++++-
 app/api/controller/CeshiController.php                 | 2 +-
 app/api/controller/TaskController.php                  | 8 +++++++-
 app/common/logic/task/TaskLogic.php                    | 7 ++++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/lists/task_template/TaskTemplateLists.php b/app/adminapi/lists/task_template/TaskTemplateLists.php
index f22440d3d..f8e7bd277 100644
--- a/app/adminapi/lists/task_template/TaskTemplateLists.php
+++ b/app/adminapi/lists/task_template/TaskTemplateLists.php
@@ -18,7 +18,7 @@ namespace app\adminapi\lists\task_template;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\task_template\TaskTemplate;
 use app\common\lists\ListsSearchInterface;
-
+use app\common\model\task_scheduling\TaskScheduling;
 
 /**
  * 任务模板列表
@@ -54,7 +54,14 @@ class TaskTemplateLists extends BaseAdminDataLists implements ListsSearchInterfa
      */
     public function lists(): array
     {
+        $parmas= $this->request->param();
+        $where=[];
+        if(isset($parmas['scheduling_id']) && $parmas['scheduling_id']>0){
+            $company_id=TaskScheduling::where(['id'=>$parmas['scheduling_id']])->value('company_id');
+            $where[]= ['company_id','=',$company_id];
+        }
         return TaskTemplate::where($this->searchWhere)
+            ->where($where)
             ->with(['admin','data_type'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
diff --git a/app/api/controller/CeshiController.php b/app/api/controller/CeshiController.php
index 2574e00b5..22e340379 100644
--- a/app/api/controller/CeshiController.php
+++ b/app/api/controller/CeshiController.php
@@ -16,7 +16,7 @@ class CeshiController extends BaseApiController
     public function index()
     {
         $all=TaskSchedulingPlan::whereDay('start_time')->where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray();
-        // halt($all);
+        halt($all);
         foreach($all as $k=>$v){
             queue(TaskInformationJob::class,$v);
         }
diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 588092e9e..0d65fec49 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -3,6 +3,7 @@
 namespace app\api\controller;
 
 use app\common\model\task\Task;
+use app\common\model\user\User;
 
 class TaskController extends BaseApiController{
 
@@ -12,7 +13,12 @@ class TaskController extends BaseApiController{
         if($this->userInfo['admin_id']!=0){
             $where[]=['company_id','=',$this->userInfo['company_id']];
         }else{
-            $where[]=['director_uid','=',$this->userId];
+            $is_captain=User::where('id',$this->userId)->value('is_captain');
+            if($is_captain==1){
+                $where[]=['type','=',31];
+            }else{
+                $where[]=['director_uid','=',$this->userId];
+            }
             // $where[]=['status','in',[1,2,3,5]];
         }
         if(isset($param['date_time']) && $param['date_time']!=''){
diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php
index 0cdc73b2b..c7e47aab5 100644
--- a/app/common/logic/task/TaskLogic.php
+++ b/app/common/logic/task/TaskLogic.php
@@ -84,15 +84,20 @@ class TaskLogic extends BaseLogic
                     'content' => $v['template_info']['content'],
                     'start_time' => strtotime($v['start_time']),
                     'end_time' => strtotime($v['end_time']),
-                    "extend" => json_encode([]),
                     'create_time' => time(),
                     'update_time' => time(),
                 ];
                 $data = $arr;
                 $data['money'] = self::task_money($v);
+                if($v['template_info']['type'] == 31){
+                    $data["extend"]=json_encode(['informationg'=>['count'=>5,'update'=>0]]);
+                }else{
+                    $data["extend"]=json_encode([]);
+                }
                 if ($v['template_info']['type'] == 32) {
                     $data['director_uid'] = $v['company']['user_id'];
                 }
+                
                 $task_id = (new Task())->insertGetId($data);
                 TaskSchedulingPlan::where('id', $v['id'])->update(['task_id' => $task_id, 'is_execute' => 1]);
                 return true;