This commit is contained in:
cruales 2023-02-10 16:55:12 -05:00
parent 24d1d65022
commit 35bab8bbb8
18 changed files with 113 additions and 36 deletions

View File

@ -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

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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,7 +37,9 @@ public class Tgenefilesdetail implements Serializable {
private String extension;
@Lob
//@Lob
//@Column(columnDefinition = "clob")
//@Type(type="org.hibernate.type.BinaryType")
private byte[] image;
private Long imagesize;

View File

@ -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);

View File

@ -1,4 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
version="2.0">
<description>Workaround for PostgreSQL and JPA annotation type @Lob</description>
<package>com.fp.armas.portal.model</package>
<entity class="Tgenefilesdetail" name="Tgenefilesdetail" access="FIELD">
<table name="Tgenefilesdetail"/>
<attributes>
<basic name="image" access="FIELD">
<column name="image" column-definition="longblob"/>
</basic>
</attributes>
</entity>
<entity class="com.fp.armas.portal.model.Tcustpersondetail" name="Tcustpersondetail" access="FIELD">
<table name="Tcustpersondetail"/>
<attributes>
<basic name="picture" access="FIELD">
<column name="picture" column-definition="oid"/>
</basic>
</attributes>
</entity>
</entity-mappings>

View File

@ -1,4 +1,27 @@
<?xml version="1.0" encoding="UTF-8" ?>
<entity-mappings version="2.0" xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd">
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
version="2.0">
<description>Workaround for PostgreSQL and JPA annotation type @Lob</description>
<package>com.fp.armas.portal.model</package>
<entity class="Tgenefilesdetail" name="Tgenefilesdetail" access="FIELD">
<table name="Tgenefilesdetail"/>
<attributes>
<basic name="image" access="FIELD">
<column name="image" column-definition="longblob"/>
</basic>
</attributes>
</entity>
<entity class="com.fp.armas.portal.model.Tcustpersondetail" name="Tcustpersondetail" access="FIELD">
<table name="Tcustpersondetail"/>
<attributes>
<basic name="picture" access="FIELD">
<column name="picture" column-definition="longblob"/>
</basic>
</attributes>
</entity>
</entity-mappings>

View File

@ -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

Binary file not shown.

View File

@ -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,17 +278,36 @@ 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 == 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);
@ -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);

View File

@ -60,43 +60,43 @@
<h:panelGroup layout="block" id="pnlRuc">
<h:panelGrid columns="3" rendered="#{!empty registroDataManager.persona.identificationcatalog and registroDataManager.persona.identificationcatalog == 'RUC'}">
<p:outputLabel for="txtNombreRazon" value="#{msg_portal['lbl_nombre_razon']}" style="width:150px; display:block;"/>
<p:inputText id="txtNombreRazon" value="#{registroDataManager.persona.name}" disabled="true" style="width:400px;" onkeyup="comaco.upperText(event, this);"/>
<p:inputText id="txtNombreRazon" value="#{registroDataManager.persona.name}" disabled="false" style="width:400px;" onkeyup="comaco.upperText(event, this);"/>
<p:message for="txtNombreRazon" display="icon"/>
</h:panelGrid>
</h:panelGroup>
<h:panelGroup layout="block" id="pnlCedula">
<h:panelGrid columns="3" rendered="#{!empty registroDataManager.persona.identificationcatalog and (registroDataManager.persona.identificationcatalog == 'CED' or registroDataManager.persona.identificationcatalog == 'PAS')}">
<p:outputLabel for="txtNombrePersona" value="#{msg_portal['lbl_nombre_completo']}" style="width:150px; display:block;"/>
<p:inputText id="txtNombrePersona" value="#{registroDataManager.adicionalPersona.firstname}" disabled="true" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:inputText id="txtNombrePersona" value="#{registroDataManager.adicionalPersona.firstname}" disabled="false" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:message for="txtNombrePersona" display="icon"/>
<p:outputLabel for="txtApellidoPaterno" value="#{msg_portal['lbl_apellido_paterno']}" style="width:150px; display:block;" rendered="false"/>
<p:inputText id="txtApellidoPaterno" value="#{registroDataManager.adicionalPersona.lastname}" rendered="false" disabled="true" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:inputText id="txtApellidoPaterno" value="#{registroDataManager.adicionalPersona.lastname}" rendered="false" disabled="false" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:message for="txtApellidoPaterno" display="icon" rendered="false"/>
<p:outputLabel for="txtApellidoMaterno" value="#{msg_portal['lbl_apellido_materno']}" style="width:150px; display:block;" rendered="false"/>
<p:inputText id="txtApellidoMaterno" value="#{registroDataManager.adicionalPersona.surename}" rendered="false" disabled="true" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:inputText id="txtApellidoMaterno" value="#{registroDataManager.adicionalPersona.surename}" rendered="false" disabled="false" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:message for="txtApellidoMaterno" display="icon" rendered="false"/>
</h:panelGrid>
</h:panelGroup>
<h:panelGroup layout="block" id="pnlactividadeco">
<h:panelGrid columns="3" rendered="#{!empty registroDataManager.persona.identificationcatalog and registroDataManager.persona.identificationcatalog == 'RUC'}">
<p:outputLabel for="txtActividadEconomica" value="#{msg_portal['lbl_actividad_economica']}" style="width:150px;display:block;"/>
<p:inputTextarea id="txtActividadEconomica" value="#{registroDataManager.persona.econimicact}" disabled="true" onkeyup="comaco.upperText(event, this);" rows="3" cols="80" autoResize="true"/>
<p:inputTextarea id="txtActividadEconomica" value="#{registroDataManager.persona.econimicact}" disabled="false" onkeyup="comaco.upperText(event, this);" rows="3" cols="80" autoResize="true"/>
<p:message for="txtActividadEconomica" display="icon"/>
</h:panelGrid>
</h:panelGroup>
<h:panelGroup layout="block" id="pnlRepresentanteLegal">
<h:panelGrid columns="3" rendered="#{!empty registroDataManager.persona.identificationcatalog and registroDataManager.persona.identificationcatalog == 'RUC'}">
<p:outputLabel for="txtCedulaRepresentante" value="#{msg_portal['lbl_cedula_representante']}" style="width:150px;display:block;"/>
<p:inputText id="txtCedulaRepresentante" value="#{registroDataManager.persona.legalrepresentidentification}" maxlength="10" disabled="true">
<p:inputText id="txtCedulaRepresentante" value="#{registroDataManager.persona.legalrepresentidentification}" maxlength="10" disabled="false">
<f:validator for="txtNumeroDocumento" validatorId="identificacionValidator"/>
<pe:keyFilter for="txtCedulaRepresentante" mask="pint"/>
</p:inputText>
<p:message for="txtCedulaRepresentante" display="icon"/>
<p:outputLabel for="txtRepresentante" value="#{msg_portal['lbl_representate_legal']}" style="width:150px;display:block;"/>
<p:inputText id="txtRepresentante" disabled="true" value="#{registroDataManager.persona.legalrepresent}" style="width: 400px;" onkeyup="comaco.upperText(event, this);"/>
<p:inputText id="txtRepresentante" disabled="false" value="#{registroDataManager.persona.legalrepresent}" style="width: 400px;" onkeyup="comaco.upperText(event, this);"/>
<p:message for="txtRepresentante" display="icon"/>
</h:panelGrid>
</h:panelGroup>
@ -162,7 +162,7 @@
<f:selectItem itemLabel="" itemValue="#{null}"/>
<f:selectItems value="#{registroDataManager.estadoCivilColl}" var="estadoCivil" itemLabel="#{estadoCivil.description}" itemValue="#{estadoCivil.id.catalog}"/>
</p:selectOneMenu> -->
<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="true"/>
<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="false"/>
<p:message for="txtEstadoCivil" display="icon"/>
<p:outputLabel for="selGenero" value="#{msg_portal['lbl_genero']}"/>
@ -172,7 +172,7 @@
<f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_masculino'])}" itemValue="M"/>
</p:selectOneMenu>
-->
<p:inputText id="selGenero" value="#{registroDataManager.cedulaSnap.genero}" disabled="true"/>
<p:inputText id="selGenero" value="#{registroDataManager.cedulaSnap.genero}" disabled="false"/>
<p:message for="selGenero" display="icon"/>
<p:outputLabel for="selProfesion" value="#{msg_portal['lbl_profesion']}" />
@ -180,7 +180,7 @@
<f:selectItem itemLabel="" itemValue="#{null}"/>
<f:selectItems value="#{registroDataManager.profesionColl}" var="profesion" itemLabel="#{profesion.description}" itemValue="#{profesion.id.catalog}"/>
</p:selectOneMenu> -->
<p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="true" style="width: 200px;"/>
<p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="false" style="width: 200px;"/>
<p:message for="selProfesion" display="icon"/>
</h:panelGrid>
<h:panelGroup layout="block" id="pnlestatura">

View File

@ -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

Binary file not shown.

View File

@ -60,43 +60,43 @@
<h:panelGroup layout="block" id="pnlRuc">
<h:panelGrid columns="3" rendered="#{!empty registroDataManager.persona.identificationcatalog and registroDataManager.persona.identificationcatalog == 'RUC'}">
<p:outputLabel for="txtNombreRazon" value="#{msg_portal['lbl_nombre_razon']}" style="width:150px; display:block;"/>
<p:inputText id="txtNombreRazon" value="#{registroDataManager.persona.name}" disabled="true" style="width:400px;" onkeyup="comaco.upperText(event, this);"/>
<p:inputText id="txtNombreRazon" value="#{registroDataManager.persona.name}" disabled="false" style="width:400px;" onkeyup="comaco.upperText(event, this);"/>
<p:message for="txtNombreRazon" display="icon"/>
</h:panelGrid>
</h:panelGroup>
<h:panelGroup layout="block" id="pnlCedula">
<h:panelGrid columns="3" rendered="#{!empty registroDataManager.persona.identificationcatalog and (registroDataManager.persona.identificationcatalog == 'CED' or registroDataManager.persona.identificationcatalog == 'PAS')}">
<p:outputLabel for="txtNombrePersona" value="#{msg_portal['lbl_nombre_completo']}" style="width:150px; display:block;"/>
<p:inputText id="txtNombrePersona" value="#{registroDataManager.adicionalPersona.firstname}" disabled="true" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:inputText id="txtNombrePersona" value="#{registroDataManager.adicionalPersona.firstname}" disabled="false" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:message for="txtNombrePersona" display="icon"/>
<p:outputLabel for="txtApellidoPaterno" value="#{msg_portal['lbl_apellido_paterno']}" style="width:150px; display:block;" rendered="false"/>
<p:inputText id="txtApellidoPaterno" value="#{registroDataManager.adicionalPersona.lastname}" rendered="false" disabled="true" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:inputText id="txtApellidoPaterno" value="#{registroDataManager.adicionalPersona.lastname}" rendered="false" disabled="false" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:message for="txtApellidoPaterno" display="icon" rendered="false"/>
<p:outputLabel for="txtApellidoMaterno" value="#{msg_portal['lbl_apellido_materno']}" style="width:150px; display:block;" rendered="false"/>
<p:inputText id="txtApellidoMaterno" value="#{registroDataManager.adicionalPersona.surename}" rendered="false" disabled="true" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:inputText id="txtApellidoMaterno" value="#{registroDataManager.adicionalPersona.surename}" rendered="false" disabled="false" style="width: 300px;" onkeyup="comaco.upperText(event, this);"/>
<p:message for="txtApellidoMaterno" display="icon" rendered="false"/>
</h:panelGrid>
</h:panelGroup>
<h:panelGroup layout="block" id="pnlactividadeco">
<h:panelGrid columns="3" rendered="#{!empty registroDataManager.persona.identificationcatalog and registroDataManager.persona.identificationcatalog == 'RUC'}">
<p:outputLabel for="txtActividadEconomica" value="#{msg_portal['lbl_actividad_economica']}" style="width:150px;display:block;"/>
<p:inputTextarea id="txtActividadEconomica" value="#{registroDataManager.persona.econimicact}" disabled="true" onkeyup="comaco.upperText(event, this);" rows="3" cols="80" autoResize="true"/>
<p:inputTextarea id="txtActividadEconomica" value="#{registroDataManager.persona.econimicact}" disabled="false" onkeyup="comaco.upperText(event, this);" rows="3" cols="80" autoResize="true"/>
<p:message for="txtActividadEconomica" display="icon"/>
</h:panelGrid>
</h:panelGroup>
<h:panelGroup layout="block" id="pnlRepresentanteLegal">
<h:panelGrid columns="3" rendered="#{!empty registroDataManager.persona.identificationcatalog and registroDataManager.persona.identificationcatalog == 'RUC'}">
<p:outputLabel for="txtCedulaRepresentante" value="#{msg_portal['lbl_cedula_representante']}" style="width:150px;display:block;"/>
<p:inputText id="txtCedulaRepresentante" value="#{registroDataManager.persona.legalrepresentidentification}" maxlength="10" disabled="true">
<p:inputText id="txtCedulaRepresentante" value="#{registroDataManager.persona.legalrepresentidentification}" maxlength="10" disabled="false">
<f:validator for="txtNumeroDocumento" validatorId="identificacionValidator"/>
<pe:keyFilter for="txtCedulaRepresentante" mask="pint"/>
</p:inputText>
<p:message for="txtCedulaRepresentante" display="icon"/>
<p:outputLabel for="txtRepresentante" value="#{msg_portal['lbl_representate_legal']}" style="width:150px;display:block;"/>
<p:inputText id="txtRepresentante" disabled="true" value="#{registroDataManager.persona.legalrepresent}" style="width: 400px;" onkeyup="comaco.upperText(event, this);"/>
<p:inputText id="txtRepresentante" disabled="false" value="#{registroDataManager.persona.legalrepresent}" style="width: 400px;" onkeyup="comaco.upperText(event, this);"/>
<p:message for="txtRepresentante" display="icon"/>
</h:panelGrid>
</h:panelGroup>
@ -162,7 +162,7 @@
<f:selectItem itemLabel="" itemValue="#{null}"/>
<f:selectItems value="#{registroDataManager.estadoCivilColl}" var="estadoCivil" itemLabel="#{estadoCivil.description}" itemValue="#{estadoCivil.id.catalog}"/>
</p:selectOneMenu> -->
<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="true"/>
<p:inputText id="txtEstadoCivil" value="#{registroDataManager.cedulaSnap.estadoCivil}" disabled="false"/>
<p:message for="txtEstadoCivil" display="icon"/>
<p:outputLabel for="selGenero" value="#{msg_portal['lbl_genero']}"/>
@ -172,7 +172,7 @@
<f:selectItem itemLabel="#{fn:toUpperCase(msg_portal['lbl_masculino'])}" itemValue="M"/>
</p:selectOneMenu>
-->
<p:inputText id="selGenero" value="#{registroDataManager.cedulaSnap.genero}" disabled="true"/>
<p:inputText id="selGenero" value="#{registroDataManager.cedulaSnap.genero}" disabled="false"/>
<p:message for="selGenero" display="icon"/>
<p:outputLabel for="selProfesion" value="#{msg_portal['lbl_profesion']}" />
@ -180,7 +180,7 @@
<f:selectItem itemLabel="" itemValue="#{null}"/>
<f:selectItems value="#{registroDataManager.profesionColl}" var="profesion" itemLabel="#{profesion.description}" itemValue="#{profesion.id.catalog}"/>
</p:selectOneMenu> -->
<p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="true" style="width: 200px;"/>
<p:inputText id="selProfesion" value="#{registroDataManager.cedulaSnap.profesion}" disabled="false" style="width: 200px;"/>
<p:message for="selProfesion" display="icon"/>
</h:panelGrid>
<h:panelGroup layout="block" id="pnlestatura">