From 880d4ef27ad06276ea3905f2034687e6fbe49d4f Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Wed, 15 Nov 2023 15:16:37 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=B0=8F=E7=BB=84=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=9B=A2=E9=98=9F-=E5=85=A5=E8=82=A1=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/TaskController.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index 5da7d0231..0ff6f3207 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -717,12 +717,12 @@ class TaskController extends BaseApiController
     public function commit_service_group_task()
     {
         try {
-            $parmas = $this->request->param(); // id  annex
+            $parmas = $this->request->param(); // id  annex amount
             $task = TaskLogic::detail($parmas);
             if (empty($task)) {
                 $this->fail('任务不存在');
             }
-            $extend = ['is_commit'=>1, 'annex'=>$parmas['annex']];
+            $extend = ['is_commit'=>1, 'annex'=>$parmas['annex'], 'amount'=>$parmas['amount']];
 
             Task::where(['id' => $parmas['id']])->update(['extend' => json_encode($extend), 'update_time' => time(), 'director_uid' => $this->userId]); // director_uid 指派人
 
@@ -734,9 +734,10 @@ class TaskController extends BaseApiController
             $approveModel->admin_id = 0; // 后台发起人id 暂时为0
             $approveModel->user_id = $this->userId; // 前台发起人用户id
             $approveModel->task_id = $task['id']; // 任务id
-            $approveModel->department_id = '0';
+            $approveModel->department_id = $this->userInfo['company_id']; // 公司id
             $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核
             $approveModel->other_type = 6;
+            $approveModel->amount = $parmas['amount']; // 入股金额
             $approveModel->extend = json_encode($extend);
             $approveModel->create_time = time();
             $approveModel->update_time = time();