From fd0b942c856178b27a1aec7796eaeafcfe3670ac Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 22 Jun 2024 14:56:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(WorkbenchController):=20=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=8F=82=E6=95=B0=E5=8A=A8=E6=80=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=9B=BE=E8=A1=A8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/WorkbenchController.php  | 34 ++++++++++++++-----
 .../StoreCashFinanceFlowController.php        |  1 +
 .../StoreCashFinanceFlowLogic.php             |  4 ++-
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/app/admin/controller/WorkbenchController.php b/app/admin/controller/WorkbenchController.php
index ab6a65cec..c7172fabc 100644
--- a/app/admin/controller/WorkbenchController.php
+++ b/app/admin/controller/WorkbenchController.php
@@ -98,14 +98,32 @@ class WorkbenchController extends BaseAdminController
     public function get_trend()
     {
         $dates = [];
-        $today = new DateTime();
-        $thirtyDaysAgo = new DateTime($today->format('Y-m-d'));
-        $thirtyDaysAgo->modify('-30 days');
-
-        for ($i = 0; $i < 31; $i++) {
-            $date = new DateTime($thirtyDaysAgo->format('Y-m-d'));
-            $date->modify('+' . $i . ' days');
-            $dates[] = $date->format('Y-m-d');
+        $date=$this->request->get('date','');
+        $days=31;
+        if($date){
+           $arr=explode('-', $date);
+           if($arr[0]==$arr[1]){
+            $date = new DateTime($arr[0]);
+            $dates[] = $date->format("Y-m-d");
+           }else{
+            $datetime_start = new DateTime($arr[0]);
+            $datetime_end = new DateTime($arr[1]);
+            $days = $datetime_start->diff($datetime_end)->days;
+            for ($i = 0; $i <= $days; $i++) {
+                $date = new DateTime($datetime_start->format('Y-m-d'));
+                $date->modify('+' . $i . ' days');
+                $dates[] = $date->format('Y-m-d');
+            }
+           }
+        }else{
+            $today = new DateTime();
+            $thirtyDaysAgo = new DateTime($today->format('Y-m-d'));
+            $thirtyDaysAgo->modify('-30 days');
+            for ($i = 0; $i < $days; $i++) {
+                $date = new DateTime($thirtyDaysAgo->format('Y-m-d'));
+                $date->modify('+' . $i . ' days');
+                $dates[] = $date->format('Y-m-d');
+            }
         }
         $data = [
             "xAxis" => $dates,
diff --git a/app/admin/controller/store_cash_finance_flow/StoreCashFinanceFlowController.php b/app/admin/controller/store_cash_finance_flow/StoreCashFinanceFlowController.php
index e8622e7a4..217b868cf 100644
--- a/app/admin/controller/store_cash_finance_flow/StoreCashFinanceFlowController.php
+++ b/app/admin/controller/store_cash_finance_flow/StoreCashFinanceFlowController.php
@@ -56,6 +56,7 @@ class StoreCashFinanceFlowController extends BaseAdminController
     public function edit()
     {
         $params = (new StoreCashFinanceFlowValidate())->post()->goCheck('edit');
+        $params['admin_id']=$this->adminId;
         $result = StoreCashFinanceFlowLogic::edit($params);
         if (true === $result) {
             return $this->success('编辑成功', [], 1, 1);
diff --git a/app/admin/logic/store_cash_finance_flow/StoreCashFinanceFlowLogic.php b/app/admin/logic/store_cash_finance_flow/StoreCashFinanceFlowLogic.php
index a32916853..2a3de4949 100644
--- a/app/admin/logic/store_cash_finance_flow/StoreCashFinanceFlowLogic.php
+++ b/app/admin/logic/store_cash_finance_flow/StoreCashFinanceFlowLogic.php
@@ -54,7 +54,9 @@ class StoreCashFinanceFlowLogic extends BaseLogic
         Db::startTrans();
         try {
             StoreCashFinanceFlow::where('id', $params['id'])->update([
-                'file' => $params['file']
+                'file' => $params['file'],
+                'static'=>1,
+                'admin_id'=>$params['admin_id'],
             ]);
 
             Db::commit();