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

fixes bug#9317 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@70948 d1611594-4594-4d17-8e1d-87c2c4800839
master
gleimar 2017-07-04 00:52:01 +00:00
parent 06978d32d8
commit 4f32472455
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java
View File

@ -116,7 +116,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
con = getConnection(); con = getConnection();
List<ConferenciaComissaoVO> lsConferencias = new ArrayList<ConferenciaComissaoVO>(); List<ConferenciaComissaoVO> lsConferencias = new ArrayList<ConferenciaComissaoVO>();
Map<String, Object> parametros = carregarParametros(dataInicial, dataFinal, null, empresa, puntoVenta, dataMovimento); Map<String, Object> parametros = carregarParametros(dataInicial, dataFinal, null, empresa, puntoVenta, dataMovimento, false);
SimpleDateFormat format = new SimpleDateFormat("MM/yyyy"); SimpleDateFormat format = new SimpleDateFormat("MM/yyyy");
String competencia = format.format(dataInicial); String competencia = format.format(dataInicial);
@ -209,7 +209,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, Map<String, Object> parametros) throws BusinessException { String competencia, Empresa empresa, PuntoVenta puntoVenta, Date dataMovimento, Map<String, Object> parametros) throws BusinessException {
try { try {
if(parametros == null){ if(parametros == null){
parametros = carregarParametros(null, null, competencia, empresa, puntoVenta, dataMovimento); parametros = carregarParametros(null, null, competencia, empresa, puntoVenta, dataMovimento, false);
} }
StringBuilder sQuery = new StringBuilder("SELECT co FROM Conferencia co "); StringBuilder sQuery = new StringBuilder("SELECT co FROM Conferencia co ");
sQuery.append("JOIN co.empresa em ").append("JOIN co.puntoVenta pv ") sQuery.append("JOIN co.empresa em ").append("JOIN co.puntoVenta pv ")
@ -257,7 +257,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
ResultSet rset = null; ResultSet rset = null;
try { try {
Map<String, Object> parametros = carregarParametros(dataInicialDate, dataFinalDate, competencia, empresa, puntoVenta, dataMovimento); Map<String, Object> parametros = carregarParametros(dataInicialDate, dataFinalDate, competencia, empresa, puntoVenta, dataMovimento, false);
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
.append("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ") .append("SELECT PV.PUNTOVENTA_ID AS \"puntoventaId\", PV.NUMPUNTOVENTA as \"numPuntoVenta\", ")
@ -471,8 +471,11 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
private Map<String, Object> carregarParametros(Date dataInicial, Date dataFinal, String competencia, Empresa empresa, private Map<String, Object> carregarParametros(Date dataInicial, Date dataFinal, String competencia, Empresa empresa,
PuntoVenta puntoVenta, Date datamovimento) throws ParseException { PuntoVenta puntoVenta, Date datamovimento, boolean formatoDataSemHora) throws ParseException {
Map<String, Object> parametros = new HashMap<String, Object>(); Map<String, Object> parametros = new HashMap<String, Object>();
String formatoData = (formatoDataSemHora?"dd/MM/yyyy":"dd/MM/yyyy HH:mm");
if (empresa != null) { if (empresa != null) {
parametros.put("empresaId", empresa.getEmpresaId()); parametros.put("empresaId", empresa.getEmpresaId());
} }
@ -481,8 +484,8 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
} }
if (datamovimento != null) { if (datamovimento != null) {
parametros.put("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(datamovimento), "dd/MM/yyyy HH:mm")); parametros.put("dataInicial", DateUtil.getStringDate(DateUtil.inicioFecha(datamovimento), formatoData));
parametros.put("dataFinal", DateUtil.getStringDate(DateUtil.fimFecha(datamovimento), "dd/MM/yyyy HH:mm")); parametros.put("dataFinal", DateUtil.getStringDate(DateUtil.fimFecha(datamovimento), formatoData));
} }
if (StringUtils.isNotBlank(competencia)) { if (StringUtils.isNotBlank(competencia)) {
@ -492,9 +495,9 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
cal.set(Calendar.YEAR, Integer.valueOf(vetCompetencia[1])); cal.set(Calendar.YEAR, Integer.valueOf(vetCompetencia[1]));
parametros.put("dataInicial", DateUtil.getDateFromString( parametros.put("dataInicial", DateUtil.getDateFromString(
cal.getActualMinimum(Calendar.DAY_OF_MONTH) + "/" + competencia + " 00:00:00", "dd/MM/yyyy hh:mm:ss")); cal.getActualMinimum(Calendar.DAY_OF_MONTH) + "/" + competencia + " 00:00:00", formatoData));
parametros.put("dataFinal", DateUtil.getDateFromString( parametros.put("dataFinal", DateUtil.getDateFromString(
cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia + " 23:59:59", "dd/MM/yyyy hh:mm:ss")); cal.getActualMaximum(Calendar.DAY_OF_MONTH) + "/" + competencia + " 23:59:59", formatoData));
} }
if(parametros.get("dataInicial") == null && dataInicial != null){ if(parametros.get("dataInicial") == null && dataInicial != null){
parametros.put("dataInicial", dataInicial); parametros.put("dataInicial", dataInicial);
@ -571,7 +574,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
private boolean isMovimentoDiarioBoletoGerado(Conferencia conferencia) private boolean isMovimentoDiarioBoletoGerado(Conferencia conferencia)
throws BusinessException { throws BusinessException {
try { try {
Map<String, Object> parametros = carregarParametros(null, null, null, conferencia.getEmpresa(), conferencia.getPuntoVenta(), null); Map<String, Object> parametros = carregarParametros(null, null, null, conferencia.getEmpresa(), conferencia.getPuntoVenta(), null, false);
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
.append("SELECT FECHAMENTOCNTCORRENTE_ID ") .append("SELECT FECHAMENTOCNTCORRENTE_ID ")
.append("FROM FECHAMENTO_CNTCORRENTE ") .append("FROM FECHAMENTO_CNTCORRENTE ")
@ -610,7 +613,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
throws BusinessException { throws BusinessException {
try { try {
Map<String, Object> parametros = carregarParametros(null, null, null, conferencia.getEmpresa(), Map<String, Object> parametros = carregarParametros(null, null, null, conferencia.getEmpresa(),
conferencia.getPuntoVenta(), conferencia.getDatamovimento()); conferencia.getPuntoVenta(), conferencia.getDatamovimento(), false);
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
.append("SELECT EE.BOLETO_ID AS \"boletoId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ") .append("SELECT EE.BOLETO_ID AS \"boletoId\", EE.EVENTOEXTRA_ID AS \"eventoextraId\", EE.NUMDOCUMENTO AS \"numdocumento\", ")
.append("CFP.IMPORTE AS \"impingreso\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", EE.DESCINFO AS \"descinfo\", ") .append("CFP.IMPORTE AS \"impingreso\", TEE.DESCTIPOEVENTO AS \"desctipoevento\", EE.DESCINFO AS \"descinfo\", ")
@ -631,7 +634,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("LEFT JOIN BOLETO B ON B.BOLETO_ID = EE.BOLETO_ID ") .append("LEFT JOIN BOLETO B ON B.BOLETO_ID = EE.BOLETO_ID ")
.append("WHERE EE.ACTIVO = 1 ") .append("WHERE EE.ACTIVO = 1 ")
//.append("AND EE.FECHORINGRESO BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ") //.append("AND EE.FECHORINGRESO BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ")
.append("AND CD.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ") .append("AND CD.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') ")
; ;
if (parametros.containsKey("empresaId")) { if (parametros.containsKey("empresaId")) {
@ -795,7 +798,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
throws BusinessException { throws BusinessException {
try { try {
Map<String, Object> parametros = carregarParametros(null, null, null, conferencia.getEmpresa(), Map<String, Object> parametros = carregarParametros(null, null, null, conferencia.getEmpresa(),
conferencia.getPuntoVenta(), conferencia.getDatamovimento()); conferencia.getPuntoVenta(), conferencia.getDatamovimento(), true);
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
.append("SELECT C.CAJA_ID AS \"cajaId\", C.NUMASIENTO AS \"numAsiento\", C.NUMASIENTOVINCULADO AS \"numAsientoVinculado\", C.NUMOPERACION AS \"numoperacion\", C.NUMFOLIOSISTEMA AS \"numFolioSistema\", ") .append("SELECT C.CAJA_ID AS \"cajaId\", C.NUMASIENTO AS \"numAsiento\", C.NUMASIENTOVINCULADO AS \"numAsientoVinculado\", C.NUMOPERACION AS \"numoperacion\", C.NUMFOLIOSISTEMA AS \"numFolioSistema\", ")
@ -809,7 +812,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("C.INDCANCELACION AS \"indCancelacion\", C.INDREIMPRESION AS \"indreimpresion\" ") .append("C.INDCANCELACION AS \"indCancelacion\", C.INDREIMPRESION AS \"indreimpresion\" ")
.append("FROM CAJA C ") .append("FROM CAJA C ")
.append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ") .append("LEFT JOIN PARADA ORI ON ORI.PARADA_ID = C.ORIGEN_ID ")
.append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.PARADA_ID ") .append("LEFT JOIN CIUDAD CID ON CID.CIUDAD_ID = ORI.CIUDAD_ID ")
.append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ") .append("LEFT JOIN ESTADO EST ON EST.ESTADO_ID = CID.ESTADO_ID ")
.append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = C.CATEGORIA_ID ") .append("LEFT JOIN CATEGORIA CAT ON CAT.CATEGORIA_ID = C.CATEGORIA_ID ")
.append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.CAJA_ID = C.CAJA_ID AND LOG.ACTIVO = 1 ") .append("LEFT JOIN LOG_CONFERENCIA LOG ON LOG.CAJA_ID = C.CAJA_ID AND LOG.ACTIVO = 1 ")
@ -821,12 +824,10 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
.append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ") .append("INNER JOIN EMPRESA E ON E.EMPRESA_ID = M.EMPRESA_ID ")
.append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ") .append("LEFT JOIN COM_EMP_FORMAPAGO COMFP ON COMFP.FORMAPAGO_ID = FP.FORMAPAGO_ID AND COMFP.EMPRESA_ID = M.EMPRESA_ID AND COMFP.ACTIVO = 1 ")
.append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = C.CATEGORIA_ID AND COMCAT.EMPRESA_ID = M.EMPRESA_ID AND COMCAT.ACTIVO = 1 ") .append("LEFT JOIN COM_EMP_CATEGORIA COMCAT ON COMCAT.CATEGORIA_ID = C.CATEGORIA_ID AND COMCAT.EMPRESA_ID = M.EMPRESA_ID AND COMCAT.ACTIVO = 1 ")
.append("INNER JOIN TARIFA T ON (T.RUTA_ID = C.RUTA_ID AND T.ORIGEN_ID = C.ORIGEN_ID AND T.DESTINO_ID = C.DESTINO_ID AND T.MARCA_ID = M.MARCA_ID) ") .append("INNER JOIN TARIFA T ON (T.DESTINO_ID = C.DESTINO_ID AND T.CLASESERVICIO_ID = C.CLASESERVICIO_ID AND T.MARCA_ID = M.MARCA_ID AND T.ORIGEN_ID = C.ORIGEN_ID AND T.RUTA_ID = C.RUTA_ID) ")
.append("INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID) ") .append("INNER JOIN VIGENCIA_TARIFA VT ON (VT.VIGENCIATARIFA_ID = T.VIGENCIATARIFA_ID) ")
.append("WHERE C.ACTIVO = 1 ") .append("WHERE C.ACTIVO = 1 ")
//.append("AND (C.MOTIVOCANCELACION_ID IS NULL OR C.MOTIVOCANCELACION_ID <> :motivocancelacionIdQuitacaoOcd) ") .append("AND C.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY') AND TO_DATE(:dataFinal, 'DD/MM/YYYY') ")
//.append("AND C.FECHORVENTA BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ")
.append("AND C.FECCORTE BETWEEN TO_DATE(:dataInicial, 'DD/MM/YYYY HH24:MI') AND TO_DATE(:dataFinal, 'DD/MM/YYYY HH24:MI') ")
.append("AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA "); .append("AND C.FECHORVENTA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA ");
if (parametros.containsKey("empresaId")) { if (parametros.containsKey("empresaId")) {
@ -929,7 +930,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
public List<OcdVO> carregarOcds(Conferencia conferencia) throws BusinessException { public List<OcdVO> carregarOcds(Conferencia conferencia) throws BusinessException {
try { try {
Map<String, Object> parametros = carregarParametros(null, null, null, conferencia.getEmpresa(), Map<String, Object> parametros = carregarParametros(null, null, null, conferencia.getEmpresa(),
conferencia.getPuntoVenta(), conferencia.getDatamovimento()); conferencia.getPuntoVenta(), conferencia.getDatamovimento(), false);
StringBuilder sQuery = new StringBuilder() StringBuilder sQuery = new StringBuilder()
.append("SELECT DISTINCT O.OCD_ID AS \"ocdId\", O.NUMOPERACION AS \"numoperacion\", O.FECINC AS \"fecinc\", O.FECPAGAR AS \"fecpagar\", O.FECPAGO AS \"fecpago\", ") .append("SELECT DISTINCT O.OCD_ID AS \"ocdId\", O.NUMOPERACION AS \"numoperacion\", O.FECINC AS \"fecinc\", O.FECPAGAR AS \"fecpagar\", O.FECPAGO AS \"fecpago\", ")
@ -1126,7 +1127,7 @@ public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO<Confere
Empresa empresa, PuntoVenta puntoVenta) throws BusinessException { Empresa empresa, PuntoVenta puntoVenta) throws BusinessException {
try { try {
String competencia = DateUtil.getStringDate(datamovimento, "MM/yyyy"); String competencia = DateUtil.getStringDate(datamovimento, "MM/yyyy");
Map<String, Object> parametros = carregarParametros(null, null, competencia, empresa, puntoVenta, null); Map<String, Object> parametros = carregarParametros(null, null, competencia, empresa, puntoVenta, null, false);
StringBuilder sQuery = new StringBuilder("SELECT co FROM Conferencia co ") StringBuilder sQuery = new StringBuilder("SELECT co FROM Conferencia co ")
.append("JOIN co.empresa em ").append("JOIN co.puntoVenta pv ") .append("JOIN co.empresa em ").append("JOIN co.puntoVenta pv ")
.append("WHERE co.activo = 1 ") .append("WHERE co.activo = 1 ")