From 4bad21b6ad053a2b7a10bcfb511b61324d8f4226 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 31 Aug 2017 14:40:16 +0000 Subject: [PATCH] fixes bug #9608 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@73368 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/FiscalHibernateDAO.java | 4 ++-- .../utilerias/impressaormd/vo/FolioRMD.java | 14 +++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index e472079e7..eab86ac48 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -4067,8 +4067,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO sql.append(" b.rmd_id as rmd_id, "); sql.append(" b.foliormd as foliormd "); sql.append("from caja b "); - sql.append(isECF ? " left " : " inner ").append(" join fiscal_r4 r4 on b.caja_id = r4.caja_id "); - sql.append(isECF ? " join fiscal_r2 r2 on r4.numserie20 = r2.numserie20 and r4.datamov = r2.datamov " : ""); + sql.append(isECF ? " inner " : " left ").append(" join fiscal_r4 r4 on b.caja_id = r4.caja_id "); + sql.append(isECF ? " inner " : " left ").append(" join fiscal_r2 r2 on r4.numserie20 = r2.numserie20 and r4.datamov = r2.datamov "); sql.append(" inner join marca m on b.marca_id = m.marca_id "); sql.append(" inner join empresa e on e.empresa_id = m.empresa_id "); sql.append(" join punto_venta pv on pv.puntoventa_id = b.puntoventa_id "); diff --git a/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java b/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java index d2dbb0c0b..53163c653 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/impressaormd/vo/FolioRMD.java @@ -3,7 +3,7 @@ package com.rjconsultores.ventaboletos.utilerias.impressaormd.vo; import java.math.BigDecimal; import java.util.Date; -public class FolioRMD { +public class FolioRMD implements Comparable { private String foliormd; private String status; @@ -21,6 +21,18 @@ public class FolioRMD { private BigDecimal outros; private BigDecimal icms; + @Override + public int compareTo(FolioRMD o) { + int result = this.tipo.compareToIgnoreCase(o.tipo); + if (result == 0) { + result = this.estado.compareToIgnoreCase(o.estado); + } + if (result == 0) { + result = this.foliormd.compareToIgnoreCase(o.foliormd); + } + return result; + } + public String getFoliormd() { return foliormd; }