Skip to content

Commit

Permalink
Merge pull request #299 from tst-labs/ISSUE-297
Browse files Browse the repository at this point in the history 
Issue 297
  • Loading branch information
@tiagoben
tiagoben authored Jun 3, 2022
2 parents 2309064 + 3c06ffe commit d8bade9
Show file tree
Hide file tree
Showing 4 changed files with 183 additions and 5 deletions.
122 changes: 120 additions & 2 deletions ...esocial-esquemas/src/main/java/br/jus/tst/esocial/esquemas/eventos/tsvinicio/ESocial.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@
* <element name="indRemunCargo" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_indRemunCargo" minOccurs="0"/>
* <element name="tpRegTrab" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_tpRegTrab"/>
* <element name="tpRegPrev" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_tpRegPrev"/>
* <element name="categOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_codCateg"/>
* <element name="cnpjOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_cnpj"/>
* <element name="matricOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_codigo_esocial"/>
* <element name="dtExercOrig" type="{http://www.w3.org/2001/XMLSchema}date"/>
* </sequence>
* </restriction>
* </complexContent>
Expand Down Expand Up @@ -533,6 +537,10 @@ public void setSignature(SignatureType value) {
* <element name="indRemunCargo" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_indRemunCargo" minOccurs="0"/>
* <element name="tpRegTrab" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_tpRegTrab"/>
* <element name="tpRegPrev" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_tpRegPrev"/>
* <element name="categOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_codCateg"/>
* <element name="cnpjOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_cnpj"/>
* <element name="matricOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_codigo_esocial"/>
* <element name="dtExercOrig" type="{http://www.w3.org/2001/XMLSchema}date"/>
* </sequence>
* </restriction>
* </complexContent>
Expand Down Expand Up @@ -839,6 +847,10 @@ public void setId(String value) {
* <element name="indRemunCargo" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_indRemunCargo" minOccurs="0"/>
* <element name="tpRegTrab" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_tpRegTrab"/>
* <element name="tpRegPrev" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_tpRegPrev"/>
* <element name="categOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_codCateg"/>
* <element name="cnpjOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_cnpj"/>
* <element name="matricOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_codigo_esocial"/>
* <element name="dtExercOrig" type="{http://www.w3.org/2001/XMLSchema}date"/>
* </sequence>
* </restriction>
* </complexContent>
Expand Down Expand Up @@ -1333,6 +1345,10 @@ public void setCodMotAfast(String value) {
* <element name="indRemunCargo" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_indRemunCargo" minOccurs="0"/>
* <element name="tpRegTrab" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_tpRegTrab"/>
* <element name="tpRegPrev" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_tpRegPrev"/>
* <element name="categOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_codCateg"/>
* <element name="cnpjOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_cnpj"/>
* <element name="matricOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_codigo_esocial"/>
* <element name="dtExercOrig" type="{http://www.w3.org/2001/XMLSchema}date"/>
* </sequence>
* </restriction>
* </complexContent>
Expand Down Expand Up @@ -1953,6 +1969,10 @@ public void setTpRegPrev(byte value) {
* <element name="indRemunCargo" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_indRemunCargo" minOccurs="0"/>
* <element name="tpRegTrab" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_tpRegTrab"/>
* <element name="tpRegPrev" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_tpRegPrev"/>
* <element name="categOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_codCateg"/>
* <element name="cnpjOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_cnpj"/>
* <element name="matricOrig" type="{http://www.esocial.gov.br/schema/evt/evtTSVInicio/v_S_01_00_00}TS_codigo_esocial"/>
* <element name="dtExercOrig" type="{http://www.w3.org/2001/XMLSchema}date"/>
* </sequence>
* </restriction>
* </complexContent>
Expand All @@ -1965,14 +1985,22 @@ public void setTpRegPrev(byte value) {
@XmlType(name = "", propOrder = {
"indRemunCargo",
"tpRegTrab",
"tpRegPrev"
"tpRegPrev",
"categOrig",
"cnpjOrig",
"matricOrig",
"dtExercOrig"
})
public static class InfoMandElet {

@XmlSchemaType(name = "string")
protected TSSimNao indRemunCargo;
protected byte tpRegTrab;
protected byte tpRegPrev;
protected BigInteger categOrig;
protected String cnpjOrig;
protected String matricOrig;
@XmlSchemaType(name = "date")
protected XMLGregorianCalendar dtExercOrig;

/**
* Gets the value of the indRemunCargo property.
Expand Down Expand Up @@ -2030,6 +2058,96 @@ public void setTpRegPrev(byte value) {
this.tpRegPrev = value;
}

/**
* Gets the value of the categOrig property.
*
* @return
* possible object is
* {@link BigInteger }
*/
public BigInteger getCategOrig() {
return categOrig;
}

/**
* Sets the value of the categOrig property.
*
*/
public void setCategOrig(BigInteger value) {
this.categOrig = value;
}

/**
* Gets the value of the cnpjOrig property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getCnpjOrig() {
return cnpjOrig;
}

/**
* Sets the value of the cnpjOrig property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setCnpjOrig(String value) {
this.cnpjOrig = value;
}

/**
* Gets the value of the matricOrig property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getMatricOrig() {
return matricOrig;
}

/**
* Sets the value of the matricOrig property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setMatricOrig(String value) {
this.matricOrig = value;
}

/**
* Gets the value of the dtExercOrig property.
*
* @return
* possible object is
* {@link XMLGregorianCalendar }
*
*/
public XMLGregorianCalendar getDtExercOrig() {
return dtExercOrig;
}

/**
* Sets the value of the dtExercOrig property.
*
* @param value
* allowed object is
* {@link XMLGregorianCalendar }
*
*/
public void setDtExercOrig(XMLGregorianCalendar value) {
this.dtExercOrig = value;
}
}


Expand Down
20 changes: 20 additions & 0 deletions src/esocial-esquemas/src/main/resources/xsd/evtTSVInicio.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,26 @@
<xs:documentation>Tipo de regime previdenciário (ou Sistema de Proteção Social dos Militares).</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="categOrig" type="TS_codCateg">
<xs:annotation>
<xs:documentation>Código da categoria de original</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="cnpjOrig" type="TS_cnpj">
<xs:annotation>
<xs:documentation>Cnpj da empresa de origem</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="matricOrig" type="TS_codigo_esocial">
<xs:annotation>
<xs:documentation>Matrícula na empresa de origem</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="dtExercOrig" type="xs:date">
<xs:annotation>
<xs:documentation>Matrícula na empresa de origem</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
Expand Down
44 changes: 42 additions & 2 deletions src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/semvinculo/InfoMandElet.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
package br.jus.tst.esocial.dominio.semvinculo;

import javax.validation.constraints.NotNull;

import org.hibernate.validator.constraints.br.CNPJ;

import java.math.BigInteger;
import java.util.Calendar;

import br.jus.tst.esocial.dominio.enums.SimNao;

public class InfoMandElet {

private SimNao indRemunCargo;
private byte tpRegTrab;
private byte tpRegPrev;

@NotNull
private BigInteger categOrig;

@CNPJ
private String cnpjOrig;

private String matricOrig;

@NotNull
private Calendar dtExercOrig;

public SimNao getIndRemunCargo() {
return indRemunCargo;
Expand All @@ -26,6 +44,28 @@ public byte getTpRegPrev() {
public void setTpRegPrev(byte tpRegPrev) {
this.tpRegPrev = tpRegPrev;
}


public BigInteger getCategOrig() {
return categOrig;
}
public void setCategOrig(BigInteger categOrig) {
this.categOrig = categOrig;
}
public String getCnpjOrig() {
return cnpjOrig;
}
public void setCnpjOrig(String cnpjOrig) {
this.cnpjOrig = cnpjOrig;
}
public String getMatricOrig() {
return matricOrig;
}
public void setMatricOrig(String matricOrig) {
this.matricOrig = matricOrig;
}
public Calendar getDtExercOrig() {
return dtExercOrig;
}
public void setDtExercOrig(Calendar dtExercOrig) {
this.dtExercOrig = dtExercOrig;
}
}
2 changes: 1 addition & 1 deletion src/esocial-jt-service/src/main/java/br/jus/tst/esocialjt/dominio/Ocorrencia.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
@Entity
@Table(name = "EST_OCORRENCIA")
@NamedQueries({
@NamedQuery(name = "Ocorrencia.ocorrenciasSemEvento", query = "SELECT o FROM Ocorrencia o where o.id NOT IN (SELECT e.ocorrencia.id FROM Evento e)"),
@NamedQuery(name = "Ocorrencia.ocorrenciasSemEvento", query = "SELECT o FROM Ocorrencia o LEFT JOIN Evento e on o.id = e.ocorrencia.id WHERE e.id IS NULL"),
@NamedQuery(name = "Ocorrencia.findNecessaryDataOnly",
query = "SELECT new br.jus.tst.esocialjt.ocorrencia.OcorrenciaDadosBasicosDTO(o.id, o.tipoOcorrencia, o.dataOcorrencia, estadoEvento, ocorrenciaTipoEvento) "
+ " FROM Ocorrencia o "
Expand Down

0 comments on commit d8bade9

Please sign in to comment.