From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 16 Dec 2024 06:57:02 +0000 (+0300)
Subject: Исправление запроса
X-Git-Tag: 1.7~161^2~5
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=eab23a28694a403e0422bb5e8b48609ebd8d8ccc;p=erp24_rep%2Fyii-erp24%2F.git

Исправление запроса
---

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();