add - 工程师分组

app/adminapi/lists/master_worker/MasterWorkerLists.php

@@ -66,6 +66,15 @@ class MasterWorkerLists extends BaseAdminDataLists implements ListsSearchInterfa
             $period_ids = MasterWorker::where('time_period','<>', '')->whereRaw($query_sql)->column('id');
             $where[] = [ 'mw.id','IN',$period_ids?:[0]];
         }
+        if (isset($this->params['labels']) && !empty($this->params['labels'])) {
+            $sqls = [];
+            foreach ($this->params['labels'] as $item) {
+                $sqls[] = "FIND_IN_SET({$item}, labels) > 0";
+            }
+            $query_sql = implode(' OR ', $sqls);
+            $period_ids = MasterWorker::where('labels','<>', '')->whereRaw($query_sql)->column('id');
+            $where[] = [ 'mw.id','IN',$period_ids?:[0]];
+        }
         if(isset($this->params['category_ids']) && !empty($this->params['category_ids'])){
             $sqls = [];
             $category_ids =[];

app/adminapi/logic/master_worker/MasterWorkerLogic.php

@@ -70,6 +70,7 @@ class MasterWorkerLogic extends BaseLogic
                 'work_status' => $params['work_status']??0,
                 'recruiting_behalf' => $params['recruiting_behalf']??'',
                 'settlement_type' => $params['settlement_type']??2,
+                'labels' => (isset($params['labels']) && $params['labels'])?implode(',',$params['labels']):'',
             ]);
 
             Db::commit();
@@ -134,6 +135,7 @@ class MasterWorkerLogic extends BaseLogic
                 'work_status' => $params['work_status']??0,
                 'recruiting_behalf' => $params['recruiting_behalf']??'',
                 'settlement_type' => $params['settlement_type']??2,
+                'labels' => (isset($params['labels']) && $params['labels'])?implode(',',$params['labels']):'',
             ]);
             Db::commit();
             return true;

app/common/logic/TableDataLogic.php

@@ -39,11 +39,11 @@ class TableDataLogic extends BaseLogic
 
 
     /**
-     * @notes 标签列表
+     * @notes 商品标签列表
      */
     public static function labels()
     {
-        return Labels::where('id','>',0)->field('id,label_name as name,id as value,"data_table_labels" as type_value')->select()->toArray();
+        return Labels::where('id','>',0)->where('label_type',1)->field('id,label_name as name,id as value,"data_table_labels" as type_value')->select()->toArray();
     }
 
     /**
@@ -65,5 +65,11 @@ class TableDataLogic extends BaseLogic
     {
         return PropertyHead::where('id','>',0)->field('id,village_name as name,id as value,"data_table_propertyHead" as type_value')->select()->toArray();
     }
-
+    /**
+     * @notes 工程师标签列表
+     */
+    public static function masterWorkerLabels()
+    {
+        return Labels::where('id','>',0)->where('label_type',2)->field('id,label_name as name,id as value,"data_table_masterWorkerLabels" as type_value')->select()->toArray();
+    }
 }