From b13b8eceef2d8483c838abeccd0985d8baebab38 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 19 Oct 2023 16:03:01 +0800
Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E4=BB=BB=E5=8A=A1=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9-=E5=B8=82=E5=9C=BA=E9=83=A8=E9=95=BF=E6=95=B0?=
=?UTF-8?q?=E5=AD=97=E5=86=9C=E8=B4=B8=E5=AE=A3=E4=BC=A0=E4=B8=9A=E5=8A=A1?=
=?UTF-8?q?=E3=80=81=E5=8A=A0=E5=B7=A5=E4=B8=9A=E5=8A=A1=E7=9A=84=E5=BB=BA?=
=?UTF-8?q?=E8=AE=BE=E5=92=8C=E6=8B=9B=E5=95=86=E5=B7=A5=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/api/controller/TaskController.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 7a8e422bb..f4f78863e 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -408,22 +408,27 @@ class TaskController extends BaseApiController
$extend['stage'] = $stage;
if ($stage == 1) {
$extend = $parmas['stage1'];
+ $extend['stage1']['is_commit'] = 1;
$remark = $parmas['stage1']['remark'];
}
if ($stage == 2) {
$extend = $parmas['stage2'];
+ $extend['stage2']['is_commit'] = 1;
$remark = $parmas['stage2']['remark'];
}
if ($stage == 3) {
$extend = $parmas['stage3'];
+ $extend['stage3']['is_commit'] = 1;
$remark = $parmas['stage3']['remark'];
}
if ($stage == 4) {
$extend = $parmas['stage4'];
+ $extend['stage4']['is_commit'] = 1;
$remark = $parmas['stage4']['remark'];
}
-// 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(), 'director_uid'=>$this->userId]); // director_uid 指派人
// 片区经理
$areaManagerId = User::where(['id' => $this->userId])->with('company')->value('area_manager');
@@ -443,7 +448,6 @@ class TaskController extends BaseApiController
$approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
$approveModel->other_type = 6;
$approveModel->extend = json_encode($extend);
- $approveModel->remark = $remark;
$approveModel->create_time = time();
$approveModel->update_time = time();
$re = $approveModel->save();