feature: task

application/admin/controller/oa/Schedule.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller\oa;
 
 use app\common\controller\Backend;
+use think\Db;
 
 /**
  * 排班
@@ -101,6 +102,29 @@ class Schedule extends Backend
         $startDate = '2025-02-22';
         $endDate = '2025-03-22';
 
+        $res = [];
+        $admins = Db::name('admin')->field('id,nickname')->select();
+        $admins = array_column($admins, NULL, 'id');
+        $adminIds = array_keys($admins);
+
+        $adminNames = array_column($admins, 'nickname', 'id');
+
+        $tmpDate = $startDate;
+        $dates = [];
+        while(true) {
+
+            if ($tmpDate > $endDate) {
+                break;
+            }
+
+            foreach ($adminIds as $adminId) {
+                $res[$adminId][$tmpDate] = '无';
+            }
+
+            $dates[] = $tmpDate;
+            $tmpDate = date('Y-m-d', strtotime($tmpDate) + 86400);
+        }
+
         $queryData = $this->model
             ->with([
                 'admin'
@@ -108,11 +132,24 @@ class Schedule extends Backend
             ->where('date', '>=', $startDate)
             ->where('date', '<=', $endDate)
             ->select();
+        foreach ($queryData as $queryDatum) {
+            $queryDatum = $queryDatum->toArray();
+
+            $adminId = $queryDatum['admin']['id'];
+            $date = $queryDatum['date'];
+            $type = $queryDatum['type'];
+
+            if (isset($res[$adminId][$date])) {
+                $res[$adminId][$date] = $this->model->getTypeList()[$type];
+            }
+        }
 
 
-        dd($queryData);
+        $this->assign('adminNames', $adminNames);
+        $this->assign('res', $res);
+        $this->assign('dates', $dates);
+        $this->assign('types', $this->model->getTypeList());
 
-        $this->assign('a', '1111');
         return $this->view->fetch();
     }
 

application/admin/view/oa/schedule/custom_index.html

@@ -16,8 +16,22 @@
 
 
                     </div>
-
-                    <span>{:$a}</span>
+                    <table class="table">
+                        <tr>
+                            <th>用户\日期</th>
+                            {foreach $dates as $date}
+                            <th>{$date}</th>
+                            {/foreach}
+                        </tr>
+                        {foreach $res as $adminId => $item}
+                        <tr>
+                            <td>{$adminNames[$adminId]}</td>
+                            {foreach $item as $typeId}
+                            <td>{$typeId}</td>
+                            {/foreach}
+                        </tr>
+                        {/foreach}
+                    </table>
                 </div>
             </div>