From 0d0d0a7e171c3cca19f8416b28c6684be0de0c96 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 11 Nov 2023 13:49:03 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E5=B8=82=E5=9C=BA=E9=83=A8=E9=95=BF?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A110=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/TaskController.php | 49 ++++++++++++---------------
1 file changed, 21 insertions(+), 28 deletions(-)
diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 702184300..7513f2907 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -415,51 +415,44 @@ class TaskController extends BaseApiController
$extend = [];
$stage = $parmas['stage']; // 当前做的是任务第几阶段
if ($stage == 1) {
- $parmas['stage1']['is_commit'] = 1;
$extend['stage1'] = $parmas['stage1'];
+ $parmas['stage1']['is_commit'] = 1;
}
if ($stage == 2) {
- $extend['stage2']['is_commit'] = 1;
$extend['stage2'] = $parmas['stage2'];
+ $extend['stage2']['is_commit'] = 1;
}
if ($stage == 3) {
- $extend['stage3']['is_commit'] = 1;
$extend['stage3'] = $parmas['stage3'];
+ $extend['stage3']['is_commit'] = 1;
}
if ($stage == 4) {
- $extend['stage4']['is_commit'] = 1;
$extend['stage4'] = $parmas['stage4'];
+ $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 指派人
// 片区经理
$areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
- // 没有则创建审批任务
- $approveModel = Approve::where(['task_id' => $task['id']])->findOrEmpty();
- if ($approveModel->isEmpty()) {
- $approveModel->type = Approve::APPROVE_TYPE_4;
- $approveModel->flow_id = 1;
- $approveModel->name = $task['title'];
- $approveModel->admin_id = 0; // 后台发起人id 暂时为0
- $approveModel->user_id = $this->userId; // 前台发起人用户id
- $approveModel->task_id = $task['id']; // 任务id
- $approveModel->department_id = '0';
- $approveModel->check_admin_ids = $areaManagerId; // 当前审批人ID 片区经理的admin_id
- $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
- $approveModel->other_type = 6;
- $approveModel->extend = json_encode($extend);
- $approveModel->create_time = time();
- $approveModel->update_time = time();
- $re = $approveModel->save();
- } else {
- // 有则更新状态
- $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
- $approveModel->save();
- }
+ // 创建审批任务
+ $approveModel = new Approve();
+ $approveModel->type = Approve::APPROVE_TYPE_4;
+ $approveModel->flow_id = 1;
+ $approveModel->name = $task['title'];
+ $approveModel->admin_id = 0; // 后台发起人id 暂时为0
+ $approveModel->user_id = $this->userId; // 前台发起人用户id
+ $approveModel->task_id = $task['id']; // 任务id
+ $approveModel->department_id = '0';
+ $approveModel->check_admin_ids = $areaManagerId; // 当前审批人ID 片区经理的admin_id
+ $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
+ $approveModel->other_type = 6;
+ $approveModel->extend = json_encode($extend);
+ $approveModel->create_time = time();
+ $approveModel->update_time = time();
+ $re = $approveModel->save();
return $this->success('ok', []);
} catch (Exception $e) {
return $this->fail($e->getMessage());
@@ -470,7 +463,7 @@ class TaskController extends BaseApiController
{
$parmas = $this->request->param();
$task = TaskLogic::detail($parmas);
- $approve = Approve::where(['task_id' =>$task['id']])->find();
+ $approve = Approve::where(['task_id' =>$task['id']])->order('id', 'desc')->find();
if ($approve) {
$task['approve_status'] = $approve['check_status']; //审核状态
$task['deny_notes'] = $approve['remark']; // 拒绝原因