From d96d9e9ac9a853a518bd063caf10e20e8fe16669 Mon Sep 17 00:00:00 2001
From: bruno <rodgger.silva@simplesip.com.br>
Date: Sun, 18 Aug 2024 17:29:40 -0400
Subject: [PATCH] colocar o org_id privado no relatorio Base. Separar query
 resquisa Agente/Hora Trabalhadas

---
 include/util/relatoriosBase.php                 | 2 +-
 relatorios/callcenter/custom/relAgenteHoras.php | 8 +++++---
 relatorios/callcenter/geral/abandonadasFila.php | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/include/util/relatoriosBase.php b/include/util/relatoriosBase.php
index 3fa76993..23563835 100755
--- a/include/util/relatoriosBase.php
+++ b/include/util/relatoriosBase.php
@@ -27,7 +27,7 @@ abstract class Relatorios
     private $___type; // Indica algum tipo incomum nos relatórios.
     private $idProg;
     private $dbcon;
-    protected $org_id;
+    private $org_id;
 
     public function __construct($idProg, $dbcon, $incDac)
     {
diff --git a/relatorios/callcenter/custom/relAgenteHoras.php b/relatorios/callcenter/custom/relAgenteHoras.php
index a3dafa51..84f8af4f 100644
--- a/relatorios/callcenter/custom/relAgenteHoras.php
+++ b/relatorios/callcenter/custom/relAgenteHoras.php
@@ -140,15 +140,16 @@ class RelAgenteHoras extends Relatorios
                     0 AS num_pausa,
                     0 AS tempo_pausa,
                     0 AS num_pausa_prod,
-                    0 AS tempo_pausa_prod
+                    0 AS tempo_pausa_prod,
                 FROM pbx_eventos_agentes a
                 INNER JOIN pbx_usuarios b ON b.matricula = a.matricula
-                INNER JOIN pbx_dacs c ON c.id = a.id_dac
+                INNER JOIN pbx_dacs c ON c.id = a.id_dac AND c.org_id = a.org_id
                 WHERE a.id_dac = COALESCE('$dac', a.id_dac)
+                AND a.org_id = ".$this->GetOrgId()."
                 AND CAST(a.login AS date) BETWEEN '$dt' AND '$dtFim'";
 
         $query .= $agente ? "AND b.matricula = COALESCE($agente, b.matricula)" : '';
-        $query .= "GROUP BY 1, 2, 3, 4, 5;";
+        $query .= "GROUP BY 1, 2, 3, 4, 5, a.org_id;";
 
         if ($this->___tipoRelatorio) {
             $query .= "select id_dac, fila, apelido, matricula, data, login, logoff, tempologin, 
@@ -219,6 +220,7 @@ class RelAgenteHoras extends Relatorios
             $somaTempo = 0;
             $somaQuantidade = 0;
 
+            $count = 0;
             foreach ($this->GetData()[0] as $row) {
                 $count++;
 
diff --git a/relatorios/callcenter/geral/abandonadasFila.php b/relatorios/callcenter/geral/abandonadasFila.php
index 62fe0cd7..edac321f 100644
--- a/relatorios/callcenter/geral/abandonadasFila.php
+++ b/relatorios/callcenter/geral/abandonadasFila.php
@@ -865,7 +865,7 @@ class RelAbandonadasFila extends Relatorios {
             $query .= "\nWHERE data_bilhete >= '%s' AND data_bilhete <= '%s'
                             AND b.evento = 'ABANDON'
                             AND a.lastapp <> 'Transferred Call'
-                            AND a.org_id = ".$this->org_id."
+                            AND a.org_id = ".$this->GetOrgId()."
                             AND b.fila = '%s'";
 
             if (GetUsoServico() && $srv) {
@@ -892,7 +892,7 @@ class RelAbandonadasFila extends Relatorios {
             $query .= "\nWHERE data_bilhete >= '%s' AND data_bilhete <= '%s' 
                         AND b.evento = 'ABANDON' 
                         AND a.lastapp <> 'Transferred Call' 
-                        AND a.org_id = ".$this->org_id."
+                        AND a.org_id = ".$this->GetOrgId()."
                         AND b.fila = '%s'";
 
             if (GetUsoServico() && $srv) {
@@ -930,8 +930,8 @@ class RelAbandonadasFila extends Relatorios {
         $query .= "\nWHERE a.data_bilhete >= '%s' AND  a.data_bilhete <= '%s'
                 AND b.evento = 'ABANDON'
                 AND a.lastapp <> 'Transferred Call'
-                AND 1 = CASE WHEN(b.evento = 'ABANDON')THEN (CASE WHEN(NOT EXISTS(SELECT '' FROM ast_eventos_dacs WHERE uid2 = b.uid2 AND evento = 'TRANSBORDANDO' AND fila = b.fila AND org_id = ".$this->org_id.")) THEN 1 ELSE 0 END) ELSE 1 END
-                AND b.org_id = $this->org_id
+                AND 1 = CASE WHEN(b.evento = 'ABANDON')THEN (CASE WHEN(NOT EXISTS(SELECT '' FROM ast_eventos_dacs WHERE uid2 = b.uid2 AND evento = 'TRANSBORDANDO' AND fila = b.fila AND org_id = ".$this->GetOrgId().")) THEN 1 ELSE 0 END) ELSE 1 END
+                AND b.org_id = ".$this->GetOrgId()."
                 AND b.fila = '%s'";
 
         if (GetUsoServico() && $srv) {