From 9fcaadc7bad3e13a45ca5e97d3099ff9b0bf0ada Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 26 Jul 2023 17:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E6=8C=89?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/TaskController.php |  3 ++-
 app/common/model/user/Task.php             | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/controller/TaskController.php b/app/adminapi/controller/TaskController.php
index 1ba53bc6e..a97a0656c 100644
--- a/app/adminapi/controller/TaskController.php
+++ b/app/adminapi/controller/TaskController.php
@@ -14,7 +14,7 @@ class TaskController extends BaseAdminController
         $param['uid'] = $this->adminId;
         [$param['page'], $param['limit']] = $this->getPage();
         [$count, $list] = (new Task())->list($param);
-        return $this->success('success', ['count' => $count, 'list' => $list]);
+        return $this->success('success', ['count' => $count, 'lists' => $list]);
     }
 
     public function create()
@@ -34,6 +34,7 @@ class TaskController extends BaseAdminController
             $param['content'] = $param['ueditorcontent'];
             $param['md_content'] = '';
         }
+        $param['start_time'] = strtotime(urldecode($param['start_time']));
         if (isset($param['end_time'])) {
             $param['end_time'] = strtotime(urldecode($param['end_time']));
             $a = $param['end_time'];
diff --git a/app/common/model/user/Task.php b/app/common/model/user/Task.php
index b832990da..2acf904fc 100644
--- a/app/common/model/user/Task.php
+++ b/app/common/model/user/Task.php
@@ -88,6 +88,12 @@ class Task extends Model
             $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']);
@@ -119,6 +125,7 @@ class Task extends Model
             } 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()) {
@@ -131,7 +138,18 @@ class Task extends Model
             $item['flow_name'] = self::$FlowStatus[(int)$item['flow_status']];
             return $item;
         });
-        return [$count, $list];
+        $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];
     }
 
     //详情