fix api3 report show

diff --git a/erp24/api3/core/services/ReportService.php b/erp24/api3/core/services/ReportService.php
index d833a397818fc8c1d80f19853dfdb94a5227191f..3c9dc6ff92d5433469657e3d24236dd9cb42de8e 100644 (file)
--- a/erp24/api3/core/services/ReportService.php
+++ b/erp24/api3/core/services/ReportService.php
@@ -23,6 +23,8 @@ class ReportService
      * @throws Exception
      */
     public function show($data) {
+        set_time_limit(600);
+
         $currentDate = $data->date_start;
         $reports = [];
 
@@ -144,7 +146,7 @@ class ReportService
                 "sum(CASE WHEN (s.phone IS NOT NULL) AND u.sale_cnt > 1 THEN 1 ELSE 0 END) as repeatBonusUserCount",
                 "s.store_id",
                 "s.admin_id"])
-                ->leftJoin('users u', 'u.phone = s.phone AND u.phone IN (\''
+                ->leftJoin('users u', 'u.phone = s.phone::varchar(20) AND u.phone IN (\''
                     . implode('\',\'', ArrayHelper::getColumn($salesPhones, 'phone')) .'\')')
                 ->where(['between', 's.date', $date_start, $date_end])
                 ->andWhere(['s.store_id' => $data->stores])