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

fixed 需要手动提交的任务，不需要修改任务指定人，在任务下发时已确定。

Browse Source
This commit is contained in:
chenbo 2023-11-28 10:58:32 +08:00
parent 89ce6e2281
commit 99b3c18a8e
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/controller/approve/ApproveController.php
View File

@ -54,7 +54,7 @@ class ApproveController extends BaseAdminController
// 提前完成 // 提前完成
if ($taskTemplate['day_count'] < $taskTemplate['stage_day_one']) { if ($taskTemplate['day_count'] < $taskTemplate['stage_day_one']) {
if (bccomp($params['amount'], 300000, 2) == -1) { if (bccomp($params['amount'], 300000, 2) == -1) {
$this->fail('该任务提前完成条件：销售总额必须达到30万元及以上'); return $this->fail('该任务提前完成条件：销售总额必须达到30万元及以上');
} else { } else {
// 提前完成标识 // 提前完成标识
$extend = $taskTemplate['extend']; $extend = $taskTemplate['extend'];
@ -93,7 +93,7 @@ class ApproveController extends BaseAdminController
} }
Db::commit(); Db::commit();
// 镇农科公司任务-数字农贸宣传业务、加工业务的建设和招商工作任务 结算 // 镇合伙人公司任务-数字农贸宣传业务、加工业务的建设和招商工作任务 结算
if ($approve->type == Approve::APPROVE_TYPE_4) { if ($approve->type == Approve::APPROVE_TYPE_4) {
$taskSchedulePlan = TaskSchedulingPlan::where('la_task_scheduling_plan.id', $task['scheduling_plan_id']) $taskSchedulePlan = TaskSchedulingPlan::where('la_task_scheduling_plan.id', $task['scheduling_plan_id'])
->where('is_pay',0) ->where('is_pay',0)

22
app/api/controller/TaskController.php
View File

@ -76,7 +76,7 @@ class TaskController extends BaseApiController
$townMasterTaskTypeList = DictData::where(['type_value' => 'town_task_type_master', 'status' => 1])->column('value', 'id'); $townMasterTaskTypeList = DictData::where(['type_value' => 'town_task_type_master', 'status' => 1])->column('value', 'id');
$res = Task::where($where) $res = Task::where($where)
->field(['id', 'title', 'money', 'template_id', 'director_uid', 'company_id', 'start_time', 'end_time', 'director_uid', 'type', 'status', 'content', 'extend']) ->field(['id', 'title', 'money', 'template_id', 'director_uid', 'company_id', 'start_time', 'end_time', 'type', 'status', 'content', 'extend'])
->page($page, 25) ->page($page, 25)
->order(['id' => 'desc', 'status' => 'asc']) ->order(['id' => 'desc', 'status' => 'asc'])
->select()->toArray(); ->select()->toArray();
@ -462,7 +462,7 @@ class TaskController extends BaseApiController
$extend['stage4']['is_commit'] = 1; $extend['stage4']['is_commit'] = 1;
} }
$extend['stage'] = $stage; $extend['stage'] = $stage;
Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time(), 'director_uid'=>$this->userId]); // director_uid 指派人 Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time()]);
// 片区经理 // 片区经理
$areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager'); $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
@ -523,7 +523,7 @@ class TaskController extends BaseApiController
'video_annex' => $parmas['video_annex'], 'video_annex' => $parmas['video_annex'],
] ]
]; ];
Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time(), 'director_uid'=>$this->userId]); // director_uid 指派人 Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time()]);
// 片区经理 // 片区经理
$areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager'); $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
@ -577,7 +577,7 @@ class TaskController extends BaseApiController
'video_annex' => $parmas['video_annex'], 'video_annex' => $parmas['video_annex'],
] ]
]; ];
Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time(), 'director_uid'=>$this->userId]); // director_uid 指派人 Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time()]);
// 片区经理 // 片区经理
$areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager'); $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
@ -634,7 +634,7 @@ class TaskController extends BaseApiController
'video_annex' => $parmas['video_annex'], 'video_annex' => $parmas['video_annex'],
] ]
]; ];
Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time(), 'director_uid'=>$this->userId]); // director_uid 指派人 Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time()]);
// 片区经理 // 片区经理
$areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager'); $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
@ -706,7 +706,7 @@ class TaskController extends BaseApiController
'video_annex' => $parmas['video_annex'], 'video_annex' => $parmas['video_annex'],
] ]
]; ];
Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time(), 'director_uid'=>$this->userId]); // director_uid 指派人 Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time()]);
// 片区经理 // 片区经理
$areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager'); $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
@ -761,7 +761,7 @@ class TaskController extends BaseApiController
'video_annex' => $parmas['video_annex'], 'video_annex' => $parmas['video_annex'],
] ]
]; ];
Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time(), 'director_uid'=>$this->userId]); // director_uid 指派人 Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time'=>time()]);
// 片区经理 // 片区经理
$areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager'); $areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
@ -850,7 +850,7 @@ class TaskController extends BaseApiController
$extend['file_type'] = $parmas['file_type']; $extend['file_type'] = $parmas['file_type'];
$extend['amount'] = $parmas['amount']; $extend['amount'] = $parmas['amount'];
Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time' => time(), 'director_uid' => $this->userId]); // director_uid 指派人 Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time' => time()]);
// 创建审批任务 // 创建审批任务
$approveModel = new Approve(); $approveModel = new Approve();
@ -889,7 +889,7 @@ class TaskController extends BaseApiController
$extend['file_type'] = $parmas['file_type']; $extend['file_type'] = $parmas['file_type'];
$extend['amount'] = $parmas['amount']; $extend['amount'] = $parmas['amount'];
Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time' => time(), 'director_uid' => $this->userId]); // director_uid 指派人 Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time' => time()]);
// 创建审批任务 // 创建审批任务
$approveModel = new Approve(); $approveModel = new Approve();
@ -928,7 +928,7 @@ class TaskController extends BaseApiController
$extend['file_type'] = $parmas['file_type']; $extend['file_type'] = $parmas['file_type'];
$extend['amount'] = $parmas['amount']; $extend['amount'] = $parmas['amount'];
Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time' => time(), 'director_uid' => $this->userId]); // director_uid 指派人 Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time' => time()]);
// 创建审批任务 // 创建审批任务
$approveModel = new Approve(); $approveModel = new Approve();
@ -967,7 +967,7 @@ class TaskController extends BaseApiController
$extend['file_type'] = $parmas['file_type']; $extend['file_type'] = $parmas['file_type'];
$extend['amount'] = $parmas['amount']; $extend['amount'] = $parmas['amount'];
Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time' => time(), 'director_uid' => $this->userId]); // director_uid 指派人 Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time' => time()]);
// 创建审批任务 // 创建审批任务
$approveModel = new Approve(); $approveModel = new Approve();