From 89d996fba54590f84ac227861f80e1a689d2da09 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 22 Aug 2023 16:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/RemoteController.php | 19 ++++++++++++++-----
 app/api/controller/TaskController.php   |  7 ++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/api/controller/RemoteController.php b/app/api/controller/RemoteController.php
index 85ce1558e..838ad9129 100644
--- a/app/api/controller/RemoteController.php
+++ b/app/api/controller/RemoteController.php
@@ -11,16 +11,25 @@ class RemoteController extends BaseApiController
 
     public array $notNeedLogin = ['index'];
 
-    public function shang_date_total_price($company,$is_day=1)
+    public function shang_date_total_price($company,$is_day=1,$arr)
     {
         if($is_day==1){
-            $yesterday = date('Y-m-d');
+            $start_time = date('Y-m-d');
+            $time=strtotime($start_time)+86399;
+            $end_time=date('Y-m-d H:i:s',$time);
         }else{
-            $yesterday = date('Y-m-d',strtotime('-1 day', time()));
+            $start_time = date('Y-m-d',strtotime('-1 day', time()));
+            $time=strtotime($start_time)+86399;
+            $end_time=date('Y-m-d H:i:s',$time);
+        }
+        if(isset($arr['start_time']) && $arr['end_time']){
+            $start_time = $arr['start_time'];
+            $end_time = $arr['end_time'];
+
         }
         $parmas = [
-            "start_date" => $yesterday,
-            "end_date" => $yesterday
+            "start_date" => $start_time,
+            "end_date" => $end_time
         ];
         switch ($company['company_type']) {
             case 18:
diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index dc37091a9..89bd492f9 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -30,16 +30,21 @@ class TaskController extends BaseApiController
         }
         if (isset($param['date_time']) && $param['date_time'] != '') {
             $time = strtotime($param['date_time']);
+            $param['start_time']=date('Y-m-d H:i:s',$time);
             $end = $time + 86399;
+            $param['end_time']=date('Y-m-d H:i:s',$end);
             $where[] = ['start_time', 'between', [$time, $end]];
         } else {
             $time = strtotime(date('Y-m-d'));
+            $param['start_time']=date('Y-m-d H:i:s',$time);
             $end = $time + 86399;
+            $param['end_time']=date('Y-m-d H:i:s',$end);
             $where[] = ['start_time', 'between', [$time, $end]];
         }
         if (isset($param['status']) && $param['status'] > 0) {
             $where[] = ['status', '=', $param['status']];
         }
+        halt($where);
         $res = Task::where($where)
             ->field(['id', 'title', 'money', 'template_id', 'director_uid', 'company_id',  'start_time', 'end_time', 'director_uid', 'type', 'status', 'content', 'extend'])
             ->page($page, 25)
@@ -48,7 +53,7 @@ class TaskController extends BaseApiController
         foreach ($res as $k => $item) {
             if ($item['type'] == 33) {
                 $company = Company::where('id', $item['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足
-                $find = App(RemoteController::class)->shang_date_total_price($company);
+                $find = App(RemoteController::class)->shang_date_total_price($company,1,$param);
                 if ($find != false) {
                     $res[$k]['extend']['transaction'] = $find;
                 } else {