diff --git a/ear/target/maven-archiver/pom.properties b/ear/target/maven-archiver/pom.properties index 5b0957e..dac1993 100644 --- a/ear/target/maven-archiver/pom.properties +++ b/ear/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 15 12:32:33 ECT 2022 +#Fri Feb 10 16:45:37 ECT 2023 version=2.1 groupId=com.fp.armas artifactId=portal-ear diff --git a/ear/target/portal-ear.ear b/ear/target/portal-ear.ear index ab19c30..152e097 100644 Binary files a/ear/target/portal-ear.ear and b/ear/target/portal-ear.ear differ diff --git a/ear/target/portal-ear/portal-ejb.jar b/ear/target/portal-ear/portal-ejb.jar index 695572d..ea415f4 100644 Binary files a/ear/target/portal-ear/portal-ejb.jar and b/ear/target/portal-ear/portal-ejb.jar differ diff --git a/ear/target/portal-ear/portal-web.war b/ear/target/portal-ear/portal-web.war index 6f8da2f..b303242 100644 Binary files a/ear/target/portal-ear/portal-web.war and b/ear/target/portal-ear/portal-web.war differ diff --git a/ejb/src/main/java/com/fp/armas/portal/model/Tgenefilesdetail.java b/ejb/src/main/java/com/fp/armas/portal/model/Tgenefilesdetail.java index db0d28d..865ad04 100644 --- a/ejb/src/main/java/com/fp/armas/portal/model/Tgenefilesdetail.java +++ b/ejb/src/main/java/com/fp/armas/portal/model/Tgenefilesdetail.java @@ -3,6 +3,7 @@ package com.fp.armas.portal.model; import java.io.Serializable; import java.sql.Timestamp; import java.util.Date; +import javax.persistence.Column; import javax.persistence.EmbeddedId; import javax.persistence.Entity; @@ -36,8 +37,10 @@ public class Tgenefilesdetail implements Serializable { private String extension; - @Lob - private byte[] image; + //@Lob + //@Column(columnDefinition = "clob") + //@Type(type="org.hibernate.type.BinaryType") + private byte[] image; private Long imagesize; diff --git a/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java b/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java index 21e4a9c..91dbaf6 100644 --- a/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java +++ b/ejb/src/main/java/com/fp/armas/portal/service/RegistroBean.java @@ -905,7 +905,7 @@ public class RegistroBean { TgenefilesdetailPK pk = new TgenefilesdetailPK(); pk.setCode(code); - pk.setDateto(FechaUtil.obtenerFecha(2999, 11, 31)); + pk.setDateto(FechaUtil.obtenerFecha(2999, Calendar.DECEMBER, 31)); return archivoDetalleDao.buscarPorId(pk); } catch (Throwable e) { throw new RegistroException(e); diff --git a/ejb/src/main/resources/META-INF/ormPortal.xml b/ejb/src/main/resources/META-INF/ormPortal.xml index d58cbf3..4416152 100644 --- a/ejb/src/main/resources/META-INF/ormPortal.xml +++ b/ejb/src/main/resources/META-INF/ormPortal.xml @@ -1,4 +1,27 @@ - - - - + + + Workaround for PostgreSQL and JPA annotation type @Lob + com.fp.armas.portal.model + + + + + + + + + + +
+ + + + + + + + + \ No newline at end of file diff --git a/ejb/target/classes/META-INF/ormPortal.xml b/ejb/target/classes/META-INF/ormPortal.xml index d58cbf3..55c50c5 100644 --- a/ejb/target/classes/META-INF/ormPortal.xml +++ b/ejb/target/classes/META-INF/ormPortal.xml @@ -1,4 +1,27 @@ - - - - + + + Workaround for PostgreSQL and JPA annotation type @Lob + com.fp.armas.portal.model + +
+ + + + + + + + +
+ + + + + + + + + \ No newline at end of file diff --git a/ejb/target/classes/com/fp/armas/portal/model/Tgenefilesdetail.class b/ejb/target/classes/com/fp/armas/portal/model/Tgenefilesdetail.class index cf5060e..8965967 100644 Binary files a/ejb/target/classes/com/fp/armas/portal/model/Tgenefilesdetail.class and b/ejb/target/classes/com/fp/armas/portal/model/Tgenefilesdetail.class differ diff --git a/ejb/target/maven-archiver/pom.properties b/ejb/target/maven-archiver/pom.properties index e00fa0e..a0fda46 100644 --- a/ejb/target/maven-archiver/pom.properties +++ b/ejb/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 15 12:32:29 ECT 2022 +#Fri Feb 10 16:45:35 ECT 2023 version=2.1 groupId=com.fp.armas artifactId=portal-ejb diff --git a/ejb/target/portal-ejb.jar b/ejb/target/portal-ejb.jar index 695572d..ea415f4 100644 Binary files a/ejb/target/portal-ejb.jar and b/ejb/target/portal-ejb.jar differ diff --git a/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java b/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java index 23456a8..9f435c4 100644 --- a/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java +++ b/web/src/main/java/com/fp/armas/portal/controller/registro/RegistroController.java @@ -40,7 +40,14 @@ import com.fp.armas.portal.webservices.snap.cedula.ClienteCedula; import com.fp.armas.portal.webservices.snap.ruc.ClienteRUC; import ec.gob.registrocivil.consultacedula.Cedula; +import ec.gov.sri.wsconsultacontribuyente.ActividadEconomica; +import ec.gov.sri.wsconsultacontribuyente.AgenteRetencion; import ec.gov.sri.wsconsultacontribuyente.ContribuyenteCompleto; +import ec.gov.sri.wsconsultacontribuyente.EstructuraOrganizacional; +import ec.gov.sri.wsconsultacontribuyente.ListaBlanca; +import ec.gov.sri.wsconsultacontribuyente.RepresentanteLegal; +import ec.gov.sri.wsconsultacontribuyente.TipoContribuyente; +import ec.gov.sri.wsconsultacontribuyente.UbicacionGeografica; /** * Bean que maneja el registro del usuario en el portal y por el cual se va a enviar dichos datos a MAIA @@ -271,18 +278,37 @@ public class RegistroController extends BaseController implements Serializable { if(personaDetalle != null){ registroDataManager.setPersona(personaDetalle); } + registroDataManager.setCedulaSnap(new Cedula()); + switch (registroDataManager.getPersona().getIdentification().length()) { case 10:{ Cedula cedula = ClienteCedula.obtenerCedula(registroDataManager.getPersona().getIdentification()); completaDatosPersonaNatural(registroDataManager.getPersona()); completaDatosSnap(cedula); + + /**VALIDACION MOMENTANEA*/ + cedula = cedula == null ? new Cedula() : cedula; registroDataManager.setCedulaSnap(cedula); registroDataManager.setRucSnap(null); } break; case 13:{ ContribuyenteCompleto contribuyente = ClienteRUC.obtenerRUC(registroDataManager.getPersona().getIdentification()); - if(!contribuyente.getCodEstado().equals("ACT")){ + if(contribuyente == null){ + contribuyente = new ContribuyenteCompleto(); + contribuyente.setActividadEconomica(new ActividadEconomica()); + contribuyente.setAgenteRetencion(new AgenteRetencion()); + contribuyente.setEstructuraOrganizacional(new EstructuraOrganizacional()); + contribuyente.setRepresentanteLegal(new RepresentanteLegal()); + contribuyente.setListaBlanca(new ListaBlanca()); + contribuyente.setTipoContribuyente(new TipoContribuyente()); + contribuyente.setUbicacionGeografica(new UbicacionGeografica()); + contribuyente.setCodEstado("ACT"); + + } + //contribuyente = contribuyente == null ? new ContribuyenteCompleto() : contribuyente; + + if(!contribuyente.getCodEstado().equals("ACT")){ FacesUtil.getInstancia().messageError("El RUC INGRESADO NO ESTA ACTIVO"); FacesContext.getCurrentInstance().getExternalContext().getFlash().setKeepMessages(Boolean.TRUE); // FacesUtil.getInstancia().eliminaBeanSesion("registroDataManager"); @@ -291,11 +317,13 @@ public class RegistroController extends BaseController implements Serializable { } completaDatosCompania(registroDataManager.getPersona()); completaDatosSnap(contribuyente); + registroDataManager.setRucSnap(contribuyente); - registroDataManager.setCedulaSnap(null); + //registroDataManager.setCedulaSnap(null); } break; default: + break; } completaDatosGenerales(personaDetalle); diff --git a/web/src/main/webapp/pages/registro/home.xhtml b/web/src/main/webapp/pages/registro/home.xhtml index c95395d..74f6247 100644 --- a/web/src/main/webapp/pages/registro/home.xhtml +++ b/web/src/main/webapp/pages/registro/home.xhtml @@ -60,43 +60,43 @@ - + - + - + - + - + - + - + @@ -162,7 +162,7 @@ --> - + @@ -172,7 +172,7 @@ --> - + @@ -180,7 +180,7 @@ --> - + diff --git a/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class b/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class index 05c16f9..d46e5b2 100644 Binary files a/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class and b/web/target/classes/com/fp/armas/portal/controller/registro/RegistroController.class differ diff --git a/web/target/maven-archiver/pom.properties b/web/target/maven-archiver/pom.properties index 56b1769..974dbaf 100644 --- a/web/target/maven-archiver/pom.properties +++ b/web/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Tue Nov 15 12:32:32 ECT 2022 +#Fri Feb 10 16:45:36 ECT 2023 version=2.1 groupId=com.fp.armas artifactId=portal-web diff --git a/web/target/portal-web.war b/web/target/portal-web.war index 6f8da2f..b303242 100644 Binary files a/web/target/portal-web.war and b/web/target/portal-web.war differ diff --git a/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class b/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class index 05c16f9..d46e5b2 100644 Binary files a/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class and b/web/target/portal-web/WEB-INF/classes/com/fp/armas/portal/controller/registro/RegistroController.class differ diff --git a/web/target/portal-web/pages/registro/home.xhtml b/web/target/portal-web/pages/registro/home.xhtml index c95395d..74f6247 100644 --- a/web/target/portal-web/pages/registro/home.xhtml +++ b/web/target/portal-web/pages/registro/home.xhtml @@ -60,43 +60,43 @@ - + - + - + - + - + - + - + @@ -162,7 +162,7 @@ --> - + @@ -172,7 +172,7 @@ --> - + @@ -180,7 +180,7 @@ --> - +