From f131a658b7c4b719d011d1d358a9b1d9c7ae98b0 Mon Sep 17 00:00:00 2001
From: zhuyu <czhuyu@163.com>
Date: Sun, 11 May 2025 17:44:49 +0800
Subject: [PATCH] feature: task

---
 application/admin/controller/oa/Task.php | 25 ++++++++++++++++++++++++
 application/admin/lang/zh-cn/oa/task.php |  2 +-
 application/admin/model/oa/Task.php      |  2 +-
 application/admin/view/oa/task/add.html  |  6 ++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/application/admin/controller/oa/Task.php b/application/admin/controller/oa/Task.php
index 3085afc..6535228 100644
--- a/application/admin/controller/oa/Task.php
+++ b/application/admin/controller/oa/Task.php
@@ -24,6 +24,10 @@ class Task extends Backend
 
     protected $dataLimit = 'personal';
 
+    protected $dataLimitField = 'exec_admin_id';
+
+    protected $dataLimitFieldAutoFill = false;
+
     public function _initialize()
     {
         parent::_initialize();
@@ -113,6 +117,26 @@ class Task extends Backend
         return $this->view->fetch();
     }
 
+    public function complete($ids)
+    {
+        if (false === $this->request->isPost()) {
+            $this->error(__("Invalid parameters"));
+        }
+
+        if (empty($ids)) {
+            $this->error(__('Parameter %s can not be empty', 'id'));
+        }
+
+        $task = $this->model->where('id', '=', $ids)->where('status', 1)->find();
+
+        if (!$task) {
+            $this->error('任务状态已变更，请刷新后操作');
+        }
+        $task->save(['status' => 3]);
+
+        $this->success();
+    }
+
     public function review($ids)
     {
         if (false === $this->request->isPost()) {
@@ -177,6 +201,7 @@ class Task extends Backend
 
             $params['create_time'] = date('Y-m-d H:i:s');
             $params['update_time'] = date('Y-m-d H:i:s');
+            $params['admin_id'] = $this->auth->id;
 
 
             $result = $this->model->allowField(true)->save($params);
diff --git a/application/admin/lang/zh-cn/oa/task.php b/application/admin/lang/zh-cn/oa/task.php
index ba93a5b..ccab904 100644
--- a/application/admin/lang/zh-cn/oa/task.php
+++ b/application/admin/lang/zh-cn/oa/task.php
@@ -3,7 +3,7 @@
 return [
     'Id'                 => 'ID',
     'Admin_id'           => '创建人id',
-    'Review_admin_id'    => '审核人id',
+    'Exec_admin_id'      => '执行人ID',
     'Type'               => '任务类型',
     'Type 1'             => '每日任务',
     'Type 2'             => '每周任务',
diff --git a/application/admin/model/oa/Task.php b/application/admin/model/oa/Task.php
index c536521..43fa03e 100644
--- a/application/admin/model/oa/Task.php
+++ b/application/admin/model/oa/Task.php
@@ -62,6 +62,6 @@ class Task extends Model
 
     public function admin()
     {
-        return $this->belongsTo('app\admin\model\Admin', 'admin_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('app\admin\model\Admin', 'exec_admin_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 }
diff --git a/application/admin/view/oa/task/add.html b/application/admin/view/oa/task/add.html
index 3ddd5c7..2de1d6a 100644
--- a/application/admin/view/oa/task/add.html
+++ b/application/admin/view/oa/task/add.html
@@ -23,6 +23,12 @@
             <input id="c-desc" class="form-control" name="row[desc]" type="text" value="">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Exec_admin_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-exec_admin_id" data-rule="required" data-source="auth/admin/selectpage" data-field="nickname" class="form-control selectpage" name="row[exec_admin_id]" type="text" value="">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Expire_start_time')}:</label>
         <div class="col-xs-12 col-sm-8">