团队

app/Http/Controllers/Api/PriorityController.php → app/Http/Controllers/Api/TagController.php

@@ -2,16 +2,16 @@
 
 namespace App\Http\Controllers\Api;
 
-use App\Service\PriorityService;
+use App\Service\TagService;
 use Illuminate\Http\Request;
 
-class PriorityController extends BaseController
+class TagController extends BaseController
 {
-    public function priorityEdit(Request $request)
+    public function tagEdit(Request $request)
     {
-        $service = new PriorityService();
+        $service = new TagService();
         $user = $request->userData;
-        list($status,$data) = $service->priorityEdit($request->all(),$user);
+        list($status,$data) = $service->tagEdit($request->all(),$user);
 
         if($status){
             return $this->json_return(200,'',$data);
@@ -20,11 +20,11 @@ class PriorityController extends BaseController
         }
     }
 
-    public function priorityAdd(Request $request)
+    public function tagAdd(Request $request)
     {
-        $service = new PriorityService();
+        $service = new TagService();
         $user = $request->userData;
-        list($status,$data) = $service->priorityAdd($request->all(),$user);
+        list($status,$data) = $service->tagAdd($request->all(),$user);
 
         if($status){
             return $this->json_return(200,'',$data);
@@ -34,11 +34,11 @@ class PriorityController extends BaseController
 
     }
 
-    public function priorityDel(Request $request)
+    public function tagDel(Request $request)
     {
-        $service = new PriorityService();
+        $service = new TagService();
         $user = $request->userData;
-        list($status,$data) = $service->priorityDel($request->all(), $user);
+        list($status,$data) = $service->tagDel($request->all(), $user);
 
         if($status){
             return $this->json_return(200,'',$data);
@@ -47,11 +47,11 @@ class PriorityController extends BaseController
         }
     }
 
-    public function priorityList(Request $request)
+    public function tagList(Request $request)
     {
-        $service = new PriorityService();
+        $service = new TagService();
         $user = $request->userData;
-        list($status,$data) = $service->priorityList($request->all(),$user);
+        list($status,$data) = $service->tagList($request->all(),$user);
 
         if($status){
             return $this->json_return(200,'',$data);
@@ -60,11 +60,11 @@ class PriorityController extends BaseController
         }
     }
 
-    public function priorityDetail(Request $request)
+    public function tagDetail(Request $request)
     {
-        $service = new PriorityService();
+        $service = new TagService();
         $user = $request->userData;
-        list($status,$data) = $service->priorityDetail($request->all(),$user);
+        list($status,$data) = $service->tagDetail($request->all(),$user);
 
         if($status){
             return $this->json_return(200,'',$data);

app/Model/Priority.php → app/Model/Tag.php

@@ -4,10 +4,10 @@ namespace App\Model;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Priority extends DataScopeBaseModel
+class Tag extends DataScopeBaseModel
 {
     protected $guarded = [];
-    protected $table = "priority"; //指定表
+    protected $table = "tag"; //指定表
     const CREATED_AT = 'crt_time';
     const UPDATED_AT = 'upd_time';
     protected $dateFormat = 'U';
@@ -18,7 +18,7 @@ class Priority extends DataScopeBaseModel
     const TYPE_TWO = 2;
     const TYPE_THREE = 3;
     const TYPE_TITLE = [
-        self::TYPE_ONE => '项目',
+        self::TYPE_ONE => '优先级',
         self::TYPE_TWO => '节点',
         self::TYPE_THREE => '任务',
     ];

app/Service/ExportFileService.php

@@ -405,8 +405,8 @@ class ExportFileService extends Service
         return [true, $this->saveExportData($return, $header)];
     }
 
-    //优先级
-    public function priority($ergs, $user)
+    //标签管理
+    public function tag($ergs, $user)
     {
         // 导出配置
         $return = [];
@@ -414,8 +414,8 @@ class ExportFileService extends Service
         $column = array_column($header_default, 'export');
         $header = array_column($header_default, 'value');
 
-        $service = new PriorityService();
-        $model = $service->priorityCommon($ergs, $user);
+        $service = new TagService();
+        $model = $service->tagCommon($ergs, $user);
 
         $model->chunk(500, function ($data) use (&$return, $service, $column, $user) {
             $data = $data->toArray();

app/Service/ImportService.php

@@ -18,7 +18,7 @@ use App\Model\MonthlyDdOrder;
 use App\Model\MonthlyPsOrder;
 use App\Model\MonthlyPwOrder;
 use App\Model\PLeaveOverOrder;
-use App\Model\Priority;
+use App\Model\Tag;
 use App\Model\RuleSet;
 use App\Model\RuleSetDetails;
 use App\Model\Team;
@@ -3972,8 +3972,8 @@ class ImportService extends Service
         return [!empty($errors) ? implode('|', $errors) : "", $update_map, $maps];
     }
 
-    // 优先级
-    public function priorityImport($array, $user, $other_param)
+    // 标签管理
+    public function tagImport($array, $user, $other_param)
     {
         $upload = $array[0];
         list($status, $msg) = $this->compareTableAndReturn($upload, $other_param);
@@ -3988,7 +3988,7 @@ class ImportService extends Service
         if (!empty($error)) return [0, $error];
 
         // 2. 业务逻辑校验
-        list($error, $update_map) = $this->priorityCheck($array, $user, $table_config);
+        list($error, $update_map) = $this->tagCheck($array, $user, $table_config);
         if (!empty($error)) return [0, $error];
 
         $time = time();
@@ -4020,7 +4020,7 @@ class ImportService extends Service
         try {
             if (!empty($insert)) {
                 foreach (array_chunk($insert, 500) as $chunk) {
-                    Priority::insert($chunk);
+                    Tag::insert($chunk);
                 }
             }
 
@@ -4028,7 +4028,7 @@ class ImportService extends Service
                 foreach ($update as $item) {
                     $uId = $item['id'];
                     unset($item['id']);
-                    Priority::where('id', $uId)->update($item);
+                    Tag::where('id', $uId)->update($item);
                 }
             }
 
@@ -4040,7 +4040,7 @@ class ImportService extends Service
         return [true, ''];
     }
 
-    private function priorityCheck(&$array, $user, $table_config)
+    private function tagCheck(&$array, $user, $table_config)
     {
         $keys = array_column($table_config, 'key');
         $codeIdx = array_search('code', $keys);
@@ -4048,11 +4048,11 @@ class ImportService extends Service
         $typeIdx = array_search('type', $keys);
         $isUseIdx = array_search('is_use', $keys);
 
-        $type_map = array_flip(Priority::TYPE_TITLE);
-        $isUse_map = array_flip(Priority::IS_USE);
+        $type_map = array_flip(Tag::TYPE_TITLE);
+        $isUse_map = array_flip(Tag::IS_USE);
 
         // 获取当前企业下已存在的优先级，用于判断是新增还是更新
-        $dbMap = Priority::where('del_time', 0)
+        $dbMap = Tag::where('del_time', 0)
             ->where('top_depart_id', $user['top_depart_id'])
             ->get()
             ->keyBy('code')

app/Service/ItemService.php

@@ -6,7 +6,7 @@ use App\Model\Device;
 use App\Model\Employee;
 use App\Model\Item;
 use App\Model\ItemDetails;
-use App\Model\Priority;
+use App\Model\Tag;
 use App\Model\SysMenu;
 use Illuminate\Support\Facades\DB;
 
@@ -231,7 +231,7 @@ class ItemService extends Service
         $customer['charge_name'] = Employee::where('id',$customer['charge_id'])->value('title');
         $customer['crt_time'] = $customer['crt_time'] ? date("Y-m-d H:i:s",$customer['crt_time']): '';
         $customer['state_title'] = Item::State_Type[$customer['state']] ?? '';
-        $customer['priority_title'] = Priority::where('id', $customer['priority_id'])->value('title') ?? "";
+        $customer['priority_title'] = Tag::where('id', $customer['priority_id'])->value('title') ?? "";
 
         $details = $this->getDetail($data['id']);
         $customer = array_merge($customer, $details);

app/Service/PriorityService.php → app/Service/TagService.php

@@ -2,20 +2,20 @@
 
 namespace App\Service;
 
-use App\Model\Priority;
+use App\Model\Tag;
 use Illuminate\Support\Facades\DB;
 
-class PriorityService extends Service
+class TagService extends Service
 {
-    public function priorityEdit($data, $user){
-        list($status,$msg) = $this->priorityRule($data,$user,false);
+    public function tagEdit($data, $user){
+        list($status,$msg) = $this->tagRule($data,$user,false);
         if(!$status) return [$status, $msg];
 
         try {
             DB::beginTransaction();
 
             $update = $msg['data'][0];
-            $model = new Priority();
+            $model = new Tag();
             $model->where('id',$data['id'])->update($update);
 
             DB::commit();
@@ -27,15 +27,15 @@ class PriorityService extends Service
         return [true,''];
     }
 
-    public function priorityAdd($data,$user){
-        list($status,$msg) = $this->priorityRule($data,$user);
+    public function tagAdd($data,$user){
+        list($status,$msg) = $this->tagRule($data,$user);
         if(!$status) return [$status,$msg];
 
         try {
             DB::beginTransaction();
 
             foreach ($msg['data'] as $value){
-                $model = new Priority();
+                $model = new Tag();
                 $model->title = $value['title'];
                 $model->code = $value['code'];
                 $model->type = $value['type'];
@@ -54,20 +54,20 @@ class PriorityService extends Service
         return [true,''];
     }
 
-    public function priorityDel($data, $user){
+    public function tagDel($data, $user){
         if(empty($data['id'])) return [false, 'ID不能为空'];
 
-        Priority::whereIn('id',$data['id'])->update([
+        Tag::whereIn('id',$data['id'])->update([
             'del_time'=>time()
         ]);
 
         return [true,''];
     }
 
-    public function priorityCommon($data,$user, $field = []){
-        if(empty($field)) $field = Priority::$field;
+    public function tagCommon($data,$user, $field = []){
+        if(empty($field)) $field = Tag::$field;
 
-        $model = Priority::TopClear($user,$data);
+        $model = Tag::TopClear($user,$data);
         $model = $model->where('del_time',0)
             ->select($field)
             ->orderby('id', 'asc');
@@ -76,21 +76,22 @@ class PriorityService extends Service
         if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
         if(isset($data['is_use'])) $model->where('is_use', $data['is_use']);
         if(! empty($data['id'])) $model->whereIn('id', $data['id']);
+        if(! empty($data['type'])) $model->where('type', $data['type']);
 
         return $model;
     }
 
-    public function priorityList($data, $user){
-        $model = $this->priorityCommon($data, $user);
+    public function tagList($data, $user){
+        $model = $this->tagCommon($data, $user);
         $list = $this->limit($model,'',$data);
         $list = $this->fillPriorityList($list, $user);
 
         return [true, $list];
     }
 
-    public function priorityDetail($data, $user){
+    public function tagDetail($data, $user){
         if(empty($data['id'])) return [false,'id不能为空'];
-        list($status, $return) = $this->priorityList(['id' => [$data['id']]], $user);
+        list($status, $return) = $this->tagList(['id' => [$data['id']]], $user);
         $return = $return['data'][0] ?? [];
 
         return [true, $return];
@@ -100,14 +101,14 @@ class PriorityService extends Service
         if(empty($list)) return $list;
 
         foreach ($list['data'] as $key => $value){
-            $list['data'][$key]['type_title'] = Priority::TYPE_TITLE[$value['type']] ?? "";
-            $list['data'][$key]['is_use_title'] = Priority::IS_USE[$value['is_use']] ?? "";
+            $list['data'][$key]['type_title'] = Tag::TYPE_TITLE[$value['type']] ?? "";
+            $list['data'][$key]['is_use_title'] = Tag::IS_USE[$value['is_use']] ?? "";
         }
 
         return $list;
     }
 
-    public function priorityRule($data,$user, $is_check = true){
+    public function tagRule($data,$user, $is_check = true){
         if(empty($data['data'])) return [false,'数据不能为空！'];
 
         $code = array_column($data['data'],'code');
@@ -138,16 +139,16 @@ class PriorityService extends Service
             if(! isset($value['sort'])) return [false, '排序字段sort不存在'];
             if (filter_var($value['sort'], FILTER_VALIDATE_INT) === false) return [false, '排序字段sort必须是整数且不能含有小数点'];
 
-            if(! isset(Priority::TYPE_TITLE[$value['type']])) return [false, 'type错误'];
+            if(! isset(Tag::TYPE_TITLE[$value['type']])) return [false, 'type错误'];
             if($is_check){
                 $data['data'][$key]['crt_time'] = time();
-                $bool = Priority::whereRaw("binary code = '{$value['code']}'")
+                $bool = Tag::whereRaw("binary code = '{$value['code']}'")
                     ->where('top_depart_id', $top_depart_id)
                     ->where('del_time',0)
                     ->exists();
             }else{
                 if($this->isEmpty($data,'id')) return [false,'id不能为空！'];
-                $bool = Priority::whereRaw("binary code = '{$value['code']}'")
+                $bool = Tag::whereRaw("binary code = '{$value['code']}'")
                     ->where('top_depart_id', $top_depart_id)
                     ->where('id','<>',$data['id'])
                     ->where('del_time',0)

config/excel/priority.php → config/excel/tag.php

@@ -1,6 +1,6 @@
 <?php
 return [
-    "name" => "优先级",
+    "name" => "标签管理",
     "array" => [
         [
             'key' =>'code',
@@ -32,7 +32,7 @@ return [
             'is_main' => true,
             'default' => 0,
             'unique' => false,
-            'enums' => array_values(\App\Model\Priority::TYPE_TITLE),
+            'enums' => array_values(\App\Model\Tag::TYPE_TITLE),
             'comments' => '必填'
         ],
         [
@@ -43,7 +43,7 @@ return [
             'is_main' => true,
             'default' => 0,
             'unique' => false,
-            'enums' => array_values(\App\Model\Priority::IS_USE),
+            'enums' => array_values(\App\Model\Tag::IS_USE),
             'comments' => '必填'
         ],
         [

routes/api.php

@@ -96,12 +96,12 @@ Route::group(['middleware'=> ['checkLogin']],function ($route){
     $route->any('itemDel', 'Api\ItemController@itemDel');
     $route->any('itemDetail', 'Api\ItemController@itemDetail');
 
-    //优先级
-    $route->any('priorityList', 'Api\PriorityController@priorityList');
-    $route->any('priorityEdit', 'Api\PriorityController@priorityEdit');
-    $route->any('priorityAdd', 'Api\PriorityController@priorityAdd');
-    $route->any('priorityDel', 'Api\PriorityController@priorityDel');
-    $route->any('priorityDetail', 'Api\PriorityController@priorityDetail');
+    //标签管理
+    $route->any('tagList', 'Api\TagController@tagList');
+    $route->any('tagEdit', 'Api\TagController@tagEdit');
+    $route->any('tagAdd', 'Api\TagController@tagAdd');
+    $route->any('tagDel', 'Api\TagController@tagDel');
+    $route->any('tagDetail', 'Api\TagController@tagDetail');
 
     //团队
     $route->any('teamList', 'Api\TeamController@teamList');