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

update

Browse Source
This commit is contained in:
chenbo 2023-10-25 14:22:55 +08:00
parent 50857f7186
commit dd9a0b5b21
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/api/controller/CronController.php
View File

@ -106,7 +106,12 @@ class CronController extends BaseApiController
//任务下发
$time = strtotime(date('Y-m-d'));
// 查询系统 所有镇农科公司 未下发 的 任务安排
$taskSchedulingList = TaskScheduling::where('cron_time', '<', $time)->where('status', 1)->where('company_type', 41)->with('company_info')->select()->toArray();
$taskSchedulingList = TaskScheduling::where('cron_time', '<', $time)
->where('status', 1)
->where('company_type', 41)
->with('company_info')
->select()
->toArray();
$taskSchedulingIds = [];
$companyIds = [];

9
app/common/logic/task/TaskLogic.php
View File

@ -439,13 +439,13 @@ class TaskLogic extends BaseLogic
$time = strtotime(date('Y-m-d'));
$directorUid = 0; // 指派给
if ($taskTemplate['extend']['task_role'] == 2) {
$marketingManagerUser = User::where(['company_id'=>$taskTemplate['company_id'], 'group_id'=> 16])->find();
$marketingManagerUser = (new User())->searchMarketingManager($taskTemplate['company_id']);
Log::info(['镇农科公司定时任务下发-市场部长user信息', $marketingManagerUser]);
$directorUid = $marketingManagerUser['id'];
}
if ($taskTemplate['extend']['task_role'] == 3) {
$serviceManagerUser = User::where(['company_id'=>$taskTemplate['company_id'], 'group_id'=> 14])->find();
$serviceManagerUser = (new User())->searchServiceManager($taskTemplate['company_id']);
Log::info(['镇农科公司定时任务下发-服务部长user信息', $serviceManagerUser]);
$directorUid = $serviceManagerUser['id'];
}
@ -623,6 +623,11 @@ class TaskLogic extends BaseLogic
}
}
private static function countTownMasterTaskMoney()
{
}
/**
* 先判定任务是否已完成 再按每个任务对应的结算方式结算
* $taskSchedulePlan 包含 task_tempalte、task_schedule、task_schedule_plan 三张表的信息