From eab23a28694a403e0422bb5e8b48609ebd8d8ccc Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 16 Dec 2024 09:57:02 +0300
Subject: [PATCH] =?utf8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?utf8?q?=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../controllers/UsersMessageManagementController.php  |  8 +++-----
 erp24/records/Users.php                               | 11 +++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php
index 0118c611..50b6fcb1 100644
--- a/erp24/controllers/UsersMessageManagementController.php
+++ b/erp24/controllers/UsersMessageManagementController.php
@@ -113,8 +113,6 @@ class UsersMessageManagementController extends Controller
             }
         }
 
-
-
         return $this->render('index', [
             'model' => $model,
             'links' => $dates,
@@ -204,7 +202,7 @@ class UsersMessageManagementController extends Controller
                 if ($type === 'call') {
                     $userData['name'] = $user['name'];
                     $userData['memorable_date_count'] = $memorableDateCount;
-                    $userData['memorable_date'] = $memorableDateExists;
+                  //  $userData['memorable_date'] = $memorableDateExists;
                     $userData['last_date'] = $lastDate;
                     $userData['deals_count'] = $dealsCount;
                     $userData['total_sum'] = $totalSum;
@@ -219,7 +217,7 @@ class UsersMessageManagementController extends Controller
                     'last_date',
                     'deals_count',
                     'total_sum',
-                    'memorable_date_count',
+                   // 'memorable_date_count',
                     'memorable_date',
                     'name',
                 ]);
@@ -304,7 +302,7 @@ class UsersMessageManagementController extends Controller
                 $userData['last_date'] = $lastDate;
                 $userData['deals_count'] = $dealsCount;
                 $userData['total_sum'] = $totalSum;
-                $userData['memorable_date_count'] = $memorableDateCount;
+               // $userData['memorable_date_count'] = $memorableDateCount;
                 $userData['memorable_date'] = $memorableDateExists;
                 $userData['name'] = $user['name'];
             }
diff --git a/erp24/records/Users.php b/erp24/records/Users.php
index d1eaf6eb..c20ebfcd 100755
--- a/erp24/records/Users.php
+++ b/erp24/records/Users.php
@@ -294,18 +294,17 @@ class Users extends \yii\db\ActiveRecord
     {
 
         $startDate = $startDate ?? date('Y-m-d');
-       // $endDate = $endDate ?? date('Y-m-d', strtotime($startDate . ' +7 days'));
-        $dateThreeYearsAgo = date('Y-m-d', strtotime("$startDate -3 years"));
+        $monthDay = date('m-d', strtotime($startDate));
+
         $salesPhone = Sales::find()
-            ->where(['>=', 'date', "$dateThreeYearsAgo 00:00:00"])
-            ->andWhere(['<=', 'date', "$dateThreeYearsAgo 23:59:59"])
+            ->where(new \yii\db\Expression("TO_CHAR(date, 'MM-DD') = :monthDay", [':monthDay' => $monthDay]))
+            ->andWhere(new \yii\db\Expression("date >= NOW() - INTERVAL '3 years'"))
             ->distinct('phone')
             ->select('phone')
             ->column();
 
         $memorableDate = UsersEvents::find()
-            ->where(['>=', 'date', "$dateThreeYearsAgo 00:00:00"])
-            ->andWhere(['<=', 'date', "$dateThreeYearsAgo 23:59:59"])
+            ->where(new \yii\db\Expression("TO_CHAR(date, 'MM-DD') = :monthDay", [':monthDay' => $monthDay]))
             ->distinct('phone')
             ->select('phone')
             ->column();
-- 
2.39.5