更新任务

app/adminapi/controller/task/TaskController.php

@@ -0,0 +1,118 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+
+namespace app\adminapi\controller\task;
+
+
+use app\adminapi\controller\BaseAdminController;
+use app\adminapi\lists\task\TaskLists;
+use app\common\logic\task\TaskLogic;
+use app\adminapi\validate\task\TaskValidate;
+
+
+/**
+ * 任务控制器
+ * Class TaskController
+ * @package app\adminapi\controller\task
+ */
+class TaskController extends BaseAdminController
+{
+
+
+    /**
+     * @notes 获取任务列表
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function lists()
+    {
+        return $this->dataLists(new TaskLists());
+    }
+
+
+    /**
+     * @notes 添加任务
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function add()
+    {
+        $params = (new TaskValidate())->post()->goCheck('add');
+
+
+        if($params['type']==1){
+            $arr=[42,43,44,45];//信息更新
+            $params['extend']['informationg']['arr']=$arr;
+            $params['extend']['informationg']['arr_count']=count($arr);
+            $params['extend']['informationg']['update']=[];
+            $params['extend']['informationg']['update_count']=0;
+        }
+
+        $result = TaskLogic::add($params);
+        if (true === $result) {
+            return $this->success('添加成功', [], 1, 1);
+        }
+        return $this->fail(TaskLogic::getError());
+    }
+
+
+    /**
+     * @notes 编辑任务
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function edit()
+    {
+        $params = (new TaskValidate())->post()->goCheck('edit');
+        $result = TaskLogic::edit($params);
+        if (true === $result) {
+            return $this->success('编辑成功', [], 1, 1);
+        }
+        return $this->fail(TaskLogic::getError());
+    }
+
+
+    /**
+     * @notes 删除任务
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function delete()
+    {
+        $params = (new TaskValidate())->post()->goCheck('delete');
+        TaskLogic::delete($params);
+        return $this->success('删除成功', [], 1, 1);
+    }
+
+
+    /**
+     * @notes 获取任务详情
+     * @return \think\response\Json
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function detail()
+    {
+        $params = (new TaskValidate())->goCheck('detail');
+        $result = TaskLogic::detail($params);
+        return $this->data($result);
+    }
+
+
+}

app/adminapi/lists/task/TaskLists.php

@@ -0,0 +1,83 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\lists\task;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\task\Task;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * 任务列表
+ * Class TaskLists
+ * @package app\adminapi\liststask
+ */
+class TaskLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['title', 'template_id', 'company_id',  'start_time', 'end_time', 'director_uid', 'type', 'status', 'content'],
+        ];
+    }
+
+
+    /**
+     * @notes 获取任务列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function lists(): array
+    {
+        if($this->adminInfo['root']==1){
+            $where=[];
+        }else{
+            $where['company_id']=$this->adminInfo['company_id'];
+        }
+        return Task::where($this->searchWhere)
+            ->where($where)
+            ->field(['id', 'title', 'template_id', 'company_id', 'admin_id', 'start_time', 'end_time', 'director_uid', 'type', 'status', 'content'])
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['id' => 'desc'])
+            ->select()
+            ->toArray();
+    }
+
+
+    /**
+     * @notes 获取任务数量
+     * @return int
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function count(): int
+    {
+        return Task::where($this->searchWhere)->count();
+    }
+
+}

app/adminapi/validate/task/TaskValidate.php

@@ -0,0 +1,94 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\validate\task;
+
+
+use app\common\validate\BaseValidate;
+
+
+/**
+ * 任务验证器
+ * Class TaskValidate
+ * @package app\adminapi\validate\task
+ */
+class TaskValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+    protected $rule = [
+        'id' => 'require',
+    ];
+
+
+    /**
+     * 参数描述
+     * @var string[]
+     */
+    protected $field = [
+        'id' => 'id',
+    ];
+
+
+    /**
+     * @notes 添加场景
+     * @return TaskValidate
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function sceneAdd()
+    {
+        return $this->remove('id', true);
+    }
+
+
+    /**
+     * @notes 编辑场景
+     * @return TaskValidate
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function sceneEdit()
+    {
+        return $this->only(['id']);
+    }
+
+
+    /**
+     * @notes 删除场景
+     * @return TaskValidate
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function sceneDelete()
+    {
+        return $this->only(['id']);
+    }
+
+
+    /**
+     * @notes 详情场景
+     * @return TaskValidate
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public function sceneDetail()
+    {
+        return $this->only(['id']);
+    }
+
+}

app/api/controller/InformationController.php

@@ -13,9 +13,12 @@ class InformationController extends BaseApiController
         $param = Request()->param();
         [$page, $limit] = $this->getPage();
         if(isset($param['user_id'])&&$param['user_id']>0){
-            $data['create_user_id'] = $param['user_id'];
+            $data[] = ['create_user_id','=',$param['user_id']];
         }else{
-            $data['company_id'] = $this->userInfo['company_id'];
+            $data[] = ['company_id','=',$this->userInfo['company_id']];
+        }
+        if(isset($param['arr']) && count($param['arr'])>0){
+            $data[] =['id','in', $param['arr']];
         }
         $res = UserInformationg::list($data,$page,$limit);
         if ($res != true) {

app/api/controller/TaskController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace app\api\controller;
+
+use app\common\model\task\Task;
+
+class TaskController extends BaseApiController{
+
+    public function lists(){
+        $param = Request()->param();
+        [$page, $limit] = $this->getPage();
+        if($this->userInfo['admin_id']!=00){
+            $where[]=['company_id','=',$this->userInfo['company_id']];
+        }else{
+            return  $this->fail('你没有权限访问');
+        }
+       $res=Task::where($where)
+        ->field(['id', 'title', 'template_id','director_uid', 'company_id',  'start_time', 'end_time', 'director_uid', 'type', 'status', 'content','extend'])
+        ->page($page,25)
+        ->order(['id' => 'desc'])
+        ->select()
+        ->toArray();
+        return $this->success('ok', $res);
+    }
+}

app/common/logic/task/TaskLogic.php

@@ -0,0 +1,133 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\common\logic\task;
+
+
+use app\common\model\task\Task;
+use app\common\logic\BaseLogic;
+use app\common\model\informationg\UserInformationg;
+use think\facade\Db;
+
+
+/**
+ * 任务逻辑
+ * Class TaskLogic
+ * @package app\adminapi\logic\task
+ */
+class TaskLogic extends BaseLogic
+{
+
+
+    /**
+     * @notes 添加任务
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public static function add(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            Task::create([
+                'title' => $params['title'],
+                'template_id' => $params['template_id'],
+                'company_id' => $params['company_id'],
+                // 'admin_id' => $params['admin_id'],
+                'start_time' => strtotime($params['start_time']),
+                'end_time' =>strtotime($params['end_time']),
+                'director_uid' => $params['director_uid'],
+                'type' => $params['type'],
+                'status' => $params['status'],
+                'content' => $params['content'],
+                'extend'=>json_encode($params['extend'])
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+ 
+
+    /**
+     * @notes 编辑任务
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public static function edit(array $params): bool
+    {
+        Db::startTrans();
+        try {
+            Task::where('id', $params['id'])->update([
+                'title' => $params['title'],
+                'template_id' => $params['template_id'],
+                'company_id' => $params['company_id'],
+                'admin_id' => $params['admin_id'],
+                'start_time' => $params['start_time'],
+                'end_time' => $params['end_time'],
+                'director_uid' => $params['director_uid'],
+                'type' => $params['type'],
+                'status' => $params['status'],
+                'content' => $params['content']
+            ]);
+
+            Db::commit();
+            return true;
+        } catch (\Exception $e) {
+            Db::rollback();
+            self::setError($e->getMessage());
+            return false;
+        }
+    }
+
+
+    /**
+     * @notes 删除任务
+     * @param array $params
+     * @return bool
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public static function delete(array $params): bool
+    {
+        return Task::destroy($params['id']);
+    }
+
+
+    /**
+     * @notes 获取任务详情
+     * @param $params
+     * @return array
+     * @author likeadmin
+     * @date 2023/08/05 13:39
+     */
+    public static function detail($params): array
+    {
+        $task= Task::findOrEmpty($params['id'])->toArray();
+        if($task){
+            if(isset($task['extend']['informationg'])){
+                $task['extend']['informationg']=UserInformationg::where('id',$task['extend']['informationg'])->field('name,phone,sex,age,update_time')
+                ->find()->toArray();
+            }
+        }
+        return $task;
+    }
+}

app/common/model/task/Task.php

@@ -0,0 +1,51 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\common\model\task;
+
+
+use app\common\model\BaseModel;
+use app\common\model\user\User;
+use think\model\concern\SoftDelete;
+
+
+/**
+ * 任务模型
+ * Class Task
+ * @package app\common\model\task
+ */
+class Task extends BaseModel
+{
+    use SoftDelete;
+    protected $name = 'task';
+    protected $deleteTime = 'delete_time';
+
+    public function getExtendAttr($value,$data)
+    {
+        $res=json_decode($value,true);
+        if($data['type']==1){
+            $res['informationg']['update_count']=count($res['informationg']['update']);
+        }
+        return $res;
+    }
+    public function getEndTimeAttr($value)
+    {
+        return date('Y-m-d',$value);
+    }
+    public function directorInfo()
+    {
+        return $this->hasOne(User::class, 'id', 'director_uid')->field(['id', 'nickname', 'avatar']);
+    }
+
+}

app/common/model/user/Task.php

@@ -1,194 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/Apache-2.0
- * @link https://www.gougucms.com
- */
-
-namespace app\common\model\user;
-
-use think\facade\Db;
-use think\model;
-
-class Task extends Model
-{
-    const ZERO = 0; //#648A8D
-    const ONE = 1; //#4AC8BE
-    const TWO = 2; //#409CDE
-    const THREE = 3; //#C0DB38
-    const FOUR = 4; //#4DCE58
-    const FIVE = 5; //#FEC939
-    const SIX = 6; //#8838DA
-    const SEVEN = 7; //#FD6206
-    const EIGHT = 8; //#F03347
-    const NINE = 9; //#A38B82
-
-    public static $Priority = [
-        self::ZERO => '未设置',
-        self::ONE => '一般',
-        self::TWO => '中',
-        self::THREE => '高',
-        self::FOUR => '紧急',
-    ];
-    public static $FlowStatus = [
-        self::ZERO => '未设置',
-        self::ONE => '未开始',
-        self::TWO => '进行中',
-        self::THREE => '等待验收',
-        self::FOUR => '已拒绝',
-        self::FIVE => '已关闭',
-        self::SIX => '通过验收',
-    ];
-
-    //列表
-    function list($param, $type = 0)
-    {
-        $where = array();
-        $map1 = [];
-        $map2 = [];
-        $map3 = [];
-        $map4 = [];
-        if (!empty($param['project_id'])) {
-            $where[] = ['project_id', '=', $param['project_id']];
-        }
-        if (!empty($param['product_id'])) {
-            $where[] = ['product_id', '=', $param['product_id']];
-        } else {
-            $map1[] = ['admin_id', '=', $param['uid']];
-            $map2[] = ['director_uid', '=', $param['uid']];
-            $map3[] = ['', 'exp', Db::raw("FIND_IN_SET({$param['uid']},assist_admin_ids)")];
-        }
-        if (!empty($param['type'])) {
-            $where[] = ['type', '=', $param['type']];
-        }
-        if (!empty($param['flow_status'])) {
-            $where[] = ['flow_status', '=', $param['flow_status']];
-        }
-        if (!empty($param['priority'])) {
-            $where[] = ['priority', '=', $param['priority']];
-        }
-        if (!empty($param['cate'])) {
-            $where[] = ['cate', '=', $param['cate']];
-        }
-        if (!empty($param['director_uid'])) {
-            $where[] = ['director_uid', 'in', $param['director_uid']];
-        }
-        if (!empty($param['keywords'])) {
-            $where[] = ['title|content', 'like', '%' . $param['keywords'] . '%'];
-        }
-        if (!empty($param['did'])) {
-            $where[] = ['did', '=', $param['did']];
-        }
-        if (!empty($param['create_time'])) {
-            $where[] = ['create_time', 'BETWEEN', [strtotime($param['create_time']), strtotime($param['create_time'] . " +1 month -1 day")]];
-        }
-        if (!empty($param['types']) && $param['types'] == 9) {
-            $where = [];
-            $where[] = ['end_time', 'BETWEEN', [strtotime(date('Y-m-d'), time()), strtotime(date('Y-m-d'), time()) + 86399]];
-            $where[] = ['flow_status', '=', 2];
-
-        }
-        if (!empty($param['start_time'])) {
-            $where[] = ['start_time', '>=', strtotime($param['start_time'])];
-        }
-        if (!empty($param['end_time'])) {
-            $where[] = ['end_time', '<=', strtotime($param['end_time']) + 86400];
-        }
-        $where[] = ['delete_time', '=', 0];
-        if ($type == 1) {
-            unset($where['project_id']);
-            $map1 = [];
-            $map2 = [];
-            $map3 = [];
-            $map4 = [];
-        }
-        $param['limit'] = !empty($param['day']) ? 999 : $param['limit'];
-
-        $query = Db::name('Task')->where(function ($query) use ($map1, $map2, $map3, $map4) {
-            $query->where($map1)->whereor($map2)->whereor($map3);
-        })->where($where);
-        $count = $query->count();
-        $list = $query->withoutField('content,md_content')
-        ->order('flow_status asc')
-        ->order('id desc')
-        ->page($param['page'])
-        ->limit($param['limit'])
-        ->select()
-        ->each(function ($item, $key) {
-            $item['director_name'] = Db::name('Admin')->where(['id' => $item['director_uid']])->value('name');
-            $item['admin_name'] = Db::name('Admin')->where(['id' => $item['admin_id']])->value('name');
-            $assist_admin_names = Db::name('Admin')->where([['id', 'in', $item['assist_admin_ids']]])->column('name');
-            $item['cate_name'] = Db::name('WorkCate')->where(['id' => $item['cate']])->value('title');
-            $item['type_name'] = Db::name('TaskCate')->where(['id' => $item['type']])->value('title');
-            $item['did_name'] = Db::name('department')->where(['id' => $item['did']])->value('title');
-            if (empty($assist_admin_names)) {
-                $item['assist_admin_names'] = '-';
-            } else {
-                $item['assist_admin_names'] = implode(',', $assist_admin_names);
-            }
-            $item['start_time'] = date('Y-m-d', $item['start_time']);
-            $item['end_time'] = date('Y-m-d', $item['end_time']);
-            $item['delay'] = 0;
-            if ($item['over_time'] > 0 && $item['flow_status'] > 3 && $item['initial_end_time'] < time()) {
-                $item['delay'] = countDays(date('Y-m-d', $item['initial_end_time']), date('Y-m-d', $item['over_time']));
-            }
-            if ($item['over_time'] == 0 && $item['flow_status'] < 2 && $item['initial_end_time'] < time()) {
-                $item['delay'] = countDays(date('Y-m-d', time()), $item['initial_end_time']);
-            }
-            $item['priority_name'] = self::$Priority[(int)$item['priority']];
-            $item['flow_name'] = self::$FlowStatus[(int)$item['flow_status']];
-            return $item;
-        });
-        $return = [];
-        if (!empty($param['day']) && !empty($param['start_time']) && !empty($param['end_time'])) {
-            foreach ($list as $item) {
-                if (isset($return[$item['start_time']]) && count($return[$item['start_time']]) > 2) {
-                    continue;
-                }
-                $return[$item['start_time']][] = $item;
-            }
-        } else {
-            $return = $list;
-        }
-        return [$count, $return];
-    }
-
-    //详情
-    public function detail($id)
-    {
-        $detail = Db::name('Task')->where(['id' => $id])->find();
-        if (!empty($detail)) {
-            $detail['product_name'] = '';
-            $detail['project_name'] = '';
-            if ($detail['project_id'] > 0) {
-                $project = Db::name('Project')->where(['id' => $detail['project_id']])->field('product_id,name')->find();
-                $detail['product_name'] = Db::name('Product')->where(['id' => $project['product_id']])->value('name');
-                $detail['project_name'] = $project['name'];
-            }
-            $detail['admin_name'] = Db::name('Admin')->where(['id' => $detail['admin_id']])->value('name');
-            $detail['work_hours'] = Db::name('Schedule')->where(['delete_time' => 0, 'tid' => $detail['id']])->sum('labor_time');
-            $detail['cate_name'] = Db::name('WorkCate')->where(['id' => $detail['cate']])->value('title');
-            $detail['type_name'] = Db::name('TaskCate')->where(['id' => $detail['type']])->value('title');
-            $find = Db::name('Admin')->where(['id' => $detail['director_uid']])->field('name,total_working_hours')->find();
-            $detail['director_name'] = $find['name'] ?? '';
-            $detail['assist_admin_names'] = '';
-            if (!empty($detail['assist_admin_ids'])) {
-                $assist_admin_names = Db::name('Admin')->where('id', 'in', $detail['assist_admin_ids'])->column('name');
-                $detail['assist_admin_names'] = implode(',', $assist_admin_names);
-            }
-            $detail['priority_name'] = self::$Priority[(int)$detail['priority']];
-            $detail['flow_name'] = self::$FlowStatus[(int)$detail['flow_status']];
-            $detail['times'] = time_trans($detail['create_time']);
-            $detail['end_time'] = date('Y-m-d H:i', $detail['end_time']);
-            $detail['delay'] = 0;
-            if ($detail['over_time'] > 0 && $detail['flow_status'] > 3 && $detail['initial_end_time'] < time()) {
-                $detail['delay'] = countDays(date('Y-m-d', $detail['initial_end_time']), date('Y-m-d', $detail['over_time']));
-            }
-            if ($detail['over_time'] == 0 && $detail['flow_status'] < 2 && $detail['initial_end_time'] < time()) {
-                $detail['delay'] = countDays(date('Y-m-d', time()), $detail['initial_end_time']);
-            }
-        }
-        return $detail;
-    }
-}
-