diff --git a/.gitignore b/.gitignore index 6a5b94952..862cfbfe9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ /.settings/org.hibernate.eclipse.console.prefs /.settings/org.jboss.ide.eclipse.as.core.prefs /target/ -/.settings/ diff --git a/pom.xml b/pom.xml index dff4bcbc9..cb19f2f5b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,41 +5,27 @@ modelWeb 1.0.0 - - 1.8 - 1.8 - 1.8 - ISO-8859-1 - - - - - rj-releases - http://52.5.53.15:8081/nexus/content/repositories/releases/ - - - + src + + + src + + **/*.java + + + - org.apache.maven.plugins - maven-release-plugin + maven-compiler-plugin 3.8.1 - @{project.version} + 1.8 + 1.8 + ISO-8859-1 - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.9.1 - - - diff --git a/src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java b/src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java index 6f63ac944..0002cb4b2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java @@ -1,5 +1,6 @@ package com.rjconsultores.ventaboletos.dao; +import java.sql.SQLException; import java.util.Date; import java.util.List; @@ -30,4 +31,8 @@ public interface RemessaCNABBancosDAO extends GenericDAO public List getEmpresas(); public Boolean atualizaRemessa(Empresa empresa, ArquivoRemessa arquivoRemessa) throws Exception; + + public FechamentoBoleto obtenerFechamentoBoletoPorNossoNumero(String nossoNumero, Integer empresaId); + + public boolean quitarFechamentoBoleto(Long fechamentoboletoId, Integer usuarioId) throws SQLException; } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java index 8b9f16ae2..b7cc39179 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java @@ -3,6 +3,7 @@ package com.rjconsultores.ventaboletos.dao.hibernate; import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.Connection; +import java.sql.SQLException; import java.sql.Statement; import java.text.DateFormat; import java.text.DecimalFormat; @@ -15,6 +16,11 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.SessionFactory; +import org.hibernate.transform.AliasToBeanResultTransformer; +import org.hibernate.type.BooleanType; +import org.hibernate.type.IntegerType; +import org.hibernate.type.LongType; +import org.hibernate.type.StringType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; @@ -1677,5 +1683,66 @@ public class RemessaCNABBancosHibernateDAO extends GenericHibernateDAO