mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-08-14 16:00:21 +08:00
parent 068162147a
commit 260bdba280
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/adminapi/lists/task_template/TaskTemplateLists.php
View File

@ -55,7 +55,7 @@ class TaskTemplateLists extends BaseAdminDataLists implements ListsSearchInterfa
public function lists(): array public function lists(): array
{ {
return TaskTemplate::where($this->searchWhere) return TaskTemplate::where($this->searchWhere)
->field(['id', 'title', 'admin_id', 'money', 'type', 'status', 'content','stage_day_one','proportion_one','stage_day_two','mediumint_two']) ->field(['id', 'title', 'admin_id', 'money', 'type', 'status', 'content','stage_day_one','proportion_one','stage_day_two','proportion_two'])
->with(['admin','data_type']) ->with(['admin','data_type'])
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])

4
app/api/controller/CeshiController.php
View File

@ -12,7 +12,8 @@ class CeshiController extends BaseApiController
public function index() public function index()
{ {
$all=TaskSchedulingPlan::whereDay('start_time','yesterday')->with(['template_info','scheduling'])->select(); $all=TaskSchedulingPlan::whereDay('end_time','yesterday')->where('is_pay',0)->with(['template_info','scheduling'])->select();
halt($all);
foreach($all as $k=>$data){ foreach($all as $k=>$data){
$task_id=explode(',',$data['task_id']); $task_id=explode(',',$data['task_id']);
$task_count=Task::where('id','in',$task_id)->field('director_uid')->with('director_info')->select(); $task_count=Task::where('id','in',$task_id)->field('director_uid')->with('director_info')->select();
@ -38,7 +39,6 @@ halt(2);
$time=strtotime(date('Y-m-d')); $time=strtotime(date('Y-m-d'));
$tiem_end=$time+86399; $tiem_end=$time+86399;
$all=TaskSchedulingPlan::where('start_time','between',[$time,$tiem_end])->where('is_execute',0)->with(['template_info','scheduling'])->select()->toArray(); $all=TaskSchedulingPlan::where('start_time','between',[$time,$tiem_end])->where('is_execute',0)->with(['template_info','scheduling'])->select()->toArray();
halt($all);
foreach($all as $k=>$v){ foreach($all as $k=>$v){
TaskLogic::CronAdd($v); TaskLogic::CronAdd($v);
} }

4
app/common/logic/task_template/TaskTemplateLogic.php
View File

@ -50,7 +50,7 @@ class TaskTemplateLogic extends BaseLogic
'stage_day_one' => $params['stage_day_one'], 'stage_day_one' => $params['stage_day_one'],
'proportion_one' => $params['proportion_one'], 'proportion_one' => $params['proportion_one'],
'stage_day_two' => $params['stage_day_two'], 'stage_day_two' => $params['stage_day_two'],
'mediumint_two' => $params['mediumint_two'], 'proportion_two' => $params['proportion_two'],
]); ]);
Db::commit(); Db::commit();
@ -84,7 +84,7 @@ class TaskTemplateLogic extends BaseLogic
'stage_day_one' => $params['stage_day_one'], 'stage_day_one' => $params['stage_day_one'],
'proportion_one' => $params['proportion_one'], 'proportion_one' => $params['proportion_one'],
'stage_day_two' => $params['stage_day_two'], 'stage_day_two' => $params['stage_day_two'],
'mediumint_two' => $params['mediumint_two'], 'proportion_two' => $params['proportion_two'],
]); ]);
Db::commit(); Db::commit();