From fb149c8225b894ff996cb63d937d4cede1190212 Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Mon, 25 Mar 2024 11:06:02 -0300
Subject: [PATCH] fixes bug#AL-3765

---
 pom.xml                                       |  2 +-
 .../impl/RelatorioCheckinAberto.java          | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 198b5ea8d..9b6029344 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.59.4</version> 
+	<version>1.60.0</version> 
 	<packaging>war</packaging>  
   
 	<properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckinAberto.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckinAberto.java
index 99eee03b0..20e732ac3 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckinAberto.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCheckinAberto.java
@@ -125,13 +125,21 @@ public class RelatorioCheckinAberto extends Relatorio {
 		sb.append("       c.feccorrida as data_servico, ");
 		sb.append("       p.cveparada || ' - ' || p.descparada as localidade, ");
 		sb.append("       cc.fechorcerrado as data_encerramento, ");
-		sb.append("       u.nombusuario as usuario, ");
+        sb.append("       case when bc.usuario_id is not null then ubc.nombusuario "); 
+		sb.append("         when uca.usuario_id is not null then uca.nombusuario "); 
+		sb.append("         else '' "); 
+		sb.append("       end as usuario, ");
 		sb.append("       cc.imei_embarcada as imei ");
-		sb.append("  from corrida c join parada p on p.parada_id = c.origen_id ");
-		sb.append("            left join checkin_cerrado cc on (c.corrida_id = cc.corrida_id and c.feccorrida=cc.feccorrida ) ");
-		sb.append("            left join usuario u on u.usuario_id = cc.usuario_id ");
-		
-
+		sb.append("  from corrida c join parada              p on p.parada_id = c.origen_id ");
+		sb.append("            left join checkin_cerrado    cc on (c.corrida_id = cc.corrida_id and c.feccorrida=cc.feccorrida ) ");
+		sb.append("            left join usuario             u on u.usuario_id = cc.usuario_id ");
+        sb.append("		            join boleto              b on (b.corrida_id = c.corrida_id and ");
+		sb.append("                                                b.origen_id = c.origen_id and ");
+		sb.append("                                                b.destino_id = c.destino_id) ");
+		sb.append("            left join boleto_checkin     bc on (bc.boletooriginal_id = b.boleto_id) ");  
+        sb.append("            left join checkin_automatico ca on (ca.boleto_id = b.boleto_id) ");
+        sb.append("            left join usuario           ubc on (ubc.usuario_id = b.usuario_id) ");                        
+        sb.append("            left join usuario           uca on (uca.usuario_id = b.usuario_id) ");
 		
 		if (empresa_id!=null) {
 			sb.append("join marca m on m.marca_id = c.marca_id ");
@@ -156,8 +164,12 @@ public class RelatorioCheckinAberto extends Relatorio {
 		if (localidade_id != null) {
 			sb.append("and p.parada_id = :localidade_id ");
 		}
-
-		sb.append("order by 2, 1, 4, 3");
+		sb.append("group by c.corrida_id, c.feccorrida, p.cveparada || ' - ' || p.descparada, cc.imei_embarcada, cc.fechorcerrado, ");
+		sb.append("      case when bc.usuario_id is not null then ubc.nombusuario ");
+		sb.append("           when uca.usuario_id is not null then uca.nombusuario "); 
+     	sb.append("           else '' ");
+     	sb.append("       end ");
+		sb.append(" order by 2, 1, 4, 3");
 
 		return sb.toString();
 	}