作者 lyh

gx

@@ -48,11 +48,27 @@ class TaskController extends BaseController @@ -48,11 +48,27 @@ class TaskController extends BaseController
48 $lists[$k]['manager_id'] = $v['manage_id']; 48 $lists[$k]['manager_id'] = $v['manage_id'];
49 $lists[$k]["manage_id_text"] = $managerModel->read(['id'=>$v['manage_id']])['name']; 49 $lists[$k]["manage_id_text"] = $managerModel->read(['id'=>$v['manage_id']])['name'];
50 $lists[$k]["count"] = $v['count']; 50 $lists[$k]["count"] = $v['count'];
51 - $lists[$k]['task_list'] = $task->list(['id'=>['in',$ids]]); 51 + $lists[$k]['task_list'] = $this->getTaskList($task,$ids);
52 } 52 }
53 $this->response('success',Code::SUCCESS,$lists); 53 $this->response('success',Code::SUCCESS,$lists);
54 } 54 }
55 55
  56 + /**
  57 + * @remark :获取任务列表
  58 + * @name :getTaskList
  59 + * @author :lyh
  60 + * @method :post
  61 + * @time :2023/8/23 15:44
  62 + */
  63 + public function getTaskList(&$task,$ids){
  64 + $lists = $task->list(['id'=>['in',$ids]]);
  65 + foreach ($lists as $k => $v){
  66 + $v['attachment'] = url('a/download/files?hash='.$v['attachment']);
  67 + $lists[$k] = $v;
  68 + }
  69 + return $lists;
  70 + }
  71 +
56 public function items(Request $request, TaskLogic $logic) 72 public function items(Request $request, TaskLogic $logic)
57 { 73 {
58 $request->validate([ 74 $request->validate([
@@ -41,14 +41,6 @@ class Task extends Base @@ -41,14 +41,6 @@ class Task extends Base
41 return self::statusMap()[$this->status] ?? ''; 41 return self::statusMap()[$this->status] ?? '';
42 } 42 }
43 43
44 - public function setAttachmentAttribute($value){  
45 - $this->attributes['attachment'] = $value;  
46 - }  
47 -  
48 - public function getAttachmentAttribute($value){  
49 - return getFileUrl($value);  
50 - }  
51 -  
52 public function getTimeoutAttribute(){ 44 public function getTimeoutAttribute(){
53 if($this->end_at === null){ 45 if($this->end_at === null){
54 return 0; 46 return 0;