diff --git a/app/adminapi/controller/approve/ApproveController.php b/app/adminapi/controller/approve/ApproveController.php new file mode 100644 index 000000000..b3f411155 --- /dev/null +++ b/app/adminapi/controller/approve/ApproveController.php @@ -0,0 +1,14 @@ +dataLists(new ApproveLists()); + } +} \ No newline at end of file diff --git a/app/adminapi/lists/approve/ApproveLists.php b/app/adminapi/lists/approve/ApproveLists.php new file mode 100644 index 000000000..4cc34a8b4 --- /dev/null +++ b/app/adminapi/lists/approve/ApproveLists.php @@ -0,0 +1,47 @@ +adminId]; // todo 放开过滤条件,只有片区经理才能查看 + return $where; + } + + public function lists(): array + { + return Approve::where($this->searchWhere) + ->where($this->queryWhere()) + ->with('task') + ->field('*') + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + public function count(): int + { + return Approve::where($this->searchWhere)->count(); + } +} \ No newline at end of file diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php index 1e765c2a7..d0ed066a3 100644 --- a/app/api/controller/TaskController.php +++ b/app/api/controller/TaskController.php @@ -243,12 +243,13 @@ class TaskController extends BaseApiController $approveModel->admin_id = 0; // 后台发起人id 暂时为0 $approveModel->user_id = $this->userId; // 前台发起人用户id $approveModel->task_id = $task['id']; // 前台发起人用户id - $approveModel->check_admin_id = $areaManagerId; // 前审批人ID 片区经理的admin_id + $approveModel->department_id = '0'; + $approveModel->check_admin_ids = $areaManagerId; // 当前审批人ID 片区经理的admin_id $approveModel->check_status = 1; // 状态 0待审核,1审核中,2审核通过,3审核不通过,4撤销审核 - $approveModel->last_admin_id = $areaManagerId; $approveModel->other_type = 6; $approveModel->create_time = time(); $approveModel->update_time = time(); + $approveModel->save(); if ($approveModel->id) { Db::commit(); diff --git a/app/common/model/Approve.php b/app/common/model/Approve.php index e6dfb4af5..822d0850c 100644 --- a/app/common/model/Approve.php +++ b/app/common/model/Approve.php @@ -2,10 +2,19 @@ namespace app\common\model; +use app\common\model\dict\DictData; +use app\common\model\task\Task; use think\model\concern\SoftDelete; class Approve extends BaseModel { use SoftDelete; protected $name = 'approve'; + protected $deleteTime = 'delete_time'; + + public function task() + { + return $this->hasOne(Task::class, 'id', 'task_id'); + } + } \ No newline at end of file