up

app/adminapi/lists/master_commission/MasterWorkerCommissionNoticeLists.php

@@ -81,12 +81,12 @@ class MasterWorkerCommissionNoticeLists extends BaseAdminDataLists implements Li
      */
     public function lists(): array
     {
-        return Db::name('master_worker_commission_notice')->alias('n')
+        $lists = Db::name('master_worker_commission_notice')->alias('n')
             ->leftJoin('master_worker mw', 'n.master_worker_id = mw.id')
             ->leftJoin('service_work sw', 'n.master_worker_id = sw.master_worker_id AND sw.create_time >= n.signing_date AND sw.create_time <= n.signing_date_end')
             ->field([
                 'n.id', 'n.commission_config_id', 'n.master_worker_id', 'n.day_num', 'n.order_num', 'n.signing_date', 'n.signing_date_end',
-                'mw.real_name', 'mw.nickname', 'mw.worker_number', 'mw.mobile',
+                'mw.real_name', 'mw.nickname', 'mw.worker_number', 'mw.mobile','mw.labels',
                 Db::raw("COUNT(CASE WHEN sw.service_status = 3 THEN sw.id ELSE null END) AS order_count"),
                 Db::raw("MAX(CASE WHEN sw.service_status = 3 THEN sw.finished_time ELSE null END) max_time")
             ])
@@ -95,6 +95,10 @@ class MasterWorkerCommissionNoticeLists extends BaseAdminDataLists implements Li
             ->group('n.master_worker_id, n.id')
             ->limit($this->limitOffset, $this->limitLength)
             ->select()->toArray();
+        foreach ($lists as &$item) {
+            $item['labels'] = $item['labels']?array_map(function ($item) { return intval($item); },explode(',',$item['labels'])):'';
+        }
+        return $lists;
     }
     /**
      * @notes 获取数量

app/adminapi/lists/master_worker/MasterWorkerServiceOrderLists.php

@@ -101,7 +101,7 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
     {
         $queryWhere = $this->queryWhere();
         $lists = Db::name('master_worker')->alias('a')->field([
-                'a.id','a.real_name','a.nickname','a.worker_number','a.recruiting_behalf','a.mobile','a.cooperation','a.category_ids',
+                'a.id','a.real_name','a.nickname','a.worker_number','a.recruiting_behalf','a.mobile','a.cooperation','a.category_ids','a.labels',
                 Db::raw("COUNT(b.id) AS all_count"),
                 Db::raw("SUM(CASE WHEN b.service_status = 3 THEN 1 ELSE 0 END) AS success_count"),
                 Db::raw("SUM(CASE WHEN b.service_status = 4 OR b.service_status = 5 THEN 1 ELSE 0 END) AS fail_count"),
@@ -116,6 +116,7 @@ class MasterWorkerServiceOrderLists extends BaseAdminDataLists implements ListsS
             ->select()->toArray();
         $categoryData = GoodsCategory::select()->toArray();
         foreach ($lists as &$item) {
+            $item['labels'] = $item['labels']?array_map(function ($item) { return intval($item); },explode(',',$item['labels'])):'';
             $item['category_name'] = $item['category_ids']?implode('、',array_column(get_parent_info($categoryData,explode(',',$item['category_ids'])),'name')):'';
         }
         return $lists;