fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#14043 

dev:Fabricio
qua:Juliane

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@92949 d1611594-4594-4d17-8e1d-87c2c4800839
master
lucassilverio 2019-05-07 19:37:57 +00:00
parent 93f5b8bfba
commit 33ce1754ec
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java
View File

@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
@ -89,9 +90,35 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
bean.setLinha(rset.getString("linha"));
bean.setNumBilhete(rset.getString("numBilhete"));
bean.setNomeIdoso(rset.getString("NOMBPASAJERO"));
bean.setRG(rset.getString("RG"));
String tipoDoc1 = rset.getString("TIPODOC1");
String tipoDoc2 = rset.getString("TIPODOC2");
if(StringUtils.isNotEmpty(tipoDoc1)) {
if(tipoDoc1.equals("1")) {
bean.setRG(rset.getString("RG"));
}
if(tipoDoc2.equals("1")) {
bean.setRG(rset.getString("CPF"));
}
} else {
bean.setRG(rset.getString("RG"));
}
if(StringUtils.isNotEmpty(tipoDoc2)) {
if(tipoDoc1.equals("2")) {
bean.setCPF(rset.getString("RG"));
}
if(tipoDoc2.equals("2")) {
bean.setCPF(rset.getString("CPF"));
}
} else {
bean.setCPF(rset.getString("CPF"));
}
bean.setUfOrgaoDoc(rset.getString("uforgaodoc"));
bean.setCPF(rset.getString("CPF"));
bean.setTel(rset.getString("tel"));
bean.setEmail(rset.getString("email"));
bean.setEndereco(rset.getString("endereco"));
@ -147,7 +174,9 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
sql.append("WHEN b.DESCNUMDOC IS NOT NULL ");
sql.append("THEN b.DESCNUMDOC ELSE c.NUMIDENTIFICAUNO ");
sql.append("END AS RG, ");
sql.append("c.TIPOIDENTIFICAUNO_ID as TIPODOC1, ");
sql.append("b.descorgaodoc uforgaodoc, ");
sql.append("c.TIPOIDENTIFICADOS_ID as TIPODOC2, ");
sql.append("CASE ");
sql.append("WHEN b.DESCNUMDOC2 IS NOT NULL ");
sql.append("THEN b.DESCNUMDOC2 ELSE c.NUMIDENTIFICADOS ");
@ -198,6 +227,7 @@ public class RelatorioGratuidadeARTESP extends Relatorio {
sql.append(" group by OC.DESCORGAO, O.CODEMPRESAPORORGAO, B.FECHORVIAJE, ca.desccategoria, ");
sql.append(" ori.cveparada, ori.descparada, des.cveparada, B.NUMASIENTO, des.descparada, ");
sql.append(" c.TIPOIDENTIFICAUNO_ID, c.TIPOIDENTIFICADOS_ID, ");
sql.append(" b.FECCORRIDA, C.NUMTELEFONO, c.DESCCORREO, CASE WHEN b.DESCNUMDOC IS NOT NULL THEN b.DESCNUMDOC ELSE c.NUMIDENTIFICAUNO END, ");
sql.append(" b.NUMFOLIOSISTEMA, CASE WHEN b.DESCNUMDOC2 IS NOT NULL THEN b.DESCNUMDOC2 ELSE c.NUMIDENTIFICADOS END, b.NOMBPASAJERO, b.NUMIDENTIFICACION, T.PRECIO, b.PRECIOPAGADO, b.descorgaodoc, r.PREFIXO, cd.DESCCALLE || ', ' || cd.NUMEXTERIOR || '-' || cd.DESCIUDAD || '/' || cd.DESESTADO, B.MOTIVOCANCELACION_ID, ");
sql.append(" T.IMPORTEOUTROS, T.IMPORTEPEDAGIO, T.IMPORTESEGURO, T.IMPORTETAXAEMBARQUE, T.IMPORTETPP, b.descorgaodoc, ");