From 99b3c18a8e96a15e7ddccdd9d12be378951f0591 Mon Sep 17 00:00:00 2001 From: chenbo <709206448@qq.com> Date: Tue, 28 Nov 2023 10:58:32 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20=E9=9C=80=E8=A6=81=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E4=BB=BB=E5=8A=A1=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E4=BA=BA=EF=BC=8C=E5=9C=A8=E4=BB=BB=E5=8A=A1=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E6=97=B6=E5=B7=B2=E7=A1=AE=E5=AE=9A=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/approve/ApproveController.php | 4 ++-- app/api/controller/TaskController.php | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/adminapi/controller/approve/ApproveController.php b/app/adminapi/controller/approve/ApproveController.php index de3c8720e..22aedacde 100644 --- a/app/adminapi/controller/approve/ApproveController.php +++ b/app/adminapi/controller/approve/ApproveController.php @@ -54,7 +54,7 @@ class ApproveController extends BaseAdminController // 提前完成 if ($taskTemplate['day_count'] < $taskTemplate['stage_day_one']) { if (bccomp($params['amount'], 300000, 2) == -1) { - $this->fail('该任务提前完成条件：销售总额必须达到30万元及以上'); + return $this->fail('该任务提前完成条件：销售总额必须达到30万元及以上'); } else { // 提前完成标识 $extend = $taskTemplate['extend']; @@ -93,7 +93,7 @@ class ApproveController extends BaseAdminController } Db::commit(); - // 镇农科公司任务-数字农贸宣传业务、加工业务的建设和招商工作任务 结算 + // 镇合伙人公司任务-数字农贸宣传业务、加工业务的建设和招商工作任务 结算 if ($approve->type == Approve::APPROVE_TYPE_4) { $taskSchedulePlan = TaskSchedulingPlan::where('la_task_scheduling_plan.id', $task['scheduling_plan_id']) ->where('is_pay',0) diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 9d7f47e8f..30c5a46bb 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -76,7 +76,7 @@ class TaskController extends BaseApiController $townMasterTaskTypeList = DictData::where(['type_value' => 'town_task_type_master', 'status' => 1])->column('value', 'id'); $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) ->order(['id' => 'desc', 'status' => 'asc']) ->select()->toArray(); @@ -462,7 +462,7 @@ class TaskController extends BaseApiController $extend['stage4']['is_commit'] = 1; } $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'); @@ -523,7 +523,7 @@ class TaskController extends BaseApiController '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'); @@ -577,7 +577,7 @@ class TaskController extends BaseApiController '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'); @@ -634,7 +634,7 @@ class TaskController extends BaseApiController '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'); @@ -706,7 +706,7 @@ class TaskController extends BaseApiController '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'); @@ -761,7 +761,7 @@ class TaskController extends BaseApiController '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'); @@ -850,7 +850,7 @@ class TaskController extends BaseApiController $extend['file_type'] = $parmas['file_type']; $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(); @@ -889,7 +889,7 @@ class TaskController extends BaseApiController $extend['file_type'] = $parmas['file_type']; $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(); @@ -928,7 +928,7 @@ class TaskController extends BaseApiController $extend['file_type'] = $parmas['file_type']; $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(); @@ -967,7 +967,7 @@ class TaskController extends BaseApiController $extend['file_type'] = $parmas['file_type']; $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();