Mapeamento de novos campos da versão S 1.3

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/beneficio/demonstrativovalores/ItemRemun.java

@@ -1,5 +1,7 @@
 package br.jus.tst.esocial.dominio.beneficio.demonstrativovalores;
 
+import br.jus.tst.esocial.dominio.folha.DescFolha;
+
 import java.math.BigDecimal;
 
 import javax.validation.constraints.NotNull;
@@ -14,6 +16,7 @@ public class ItemRemun {
 	    @NotNull
 	    private BigDecimal vrRubr;
 	    private byte indApurIR;
+		private DescFolha descFolha;
 		public String getCodRubr() {
 			return codRubr;
 		}
@@ -50,4 +53,10 @@ public byte getIndApurIR() {
 		public void setIndApurIR(byte indApurIR) {
 			this.indApurIR = indApurIR;
 		}
+		public DescFolha getDescFolha() {
+			return descFolha;
+		}
+		public void setDescFolha(DescFolha descFolha) {
+			this.descFolha = descFolha;
+		}
 }

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/desligamento/InfoInterm.java

@@ -3,6 +3,7 @@
 public class InfoInterm {
 
 	private byte dia;
+	private String hrsTrab;
 
 	public byte getDia() {
 		return dia;
@@ -11,4 +12,12 @@ public byte getDia() {
 	public void setDia(byte dia) {
 		this.dia = dia;
 	}
+
+	public String getHrsTrab() {
+		return hrsTrab;
+	}
+
+	public void setHrsTrab(String hrsTrab) {
+		this.hrsTrab = hrsTrab;
+	}
 }

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/empregador/InfoCadastro.java

@@ -47,6 +47,8 @@ public class InfoCadastro {
 
 	private String indTribFolhaPisCofins;
 
+	private String indTribFolhaPisPasep;
+
 	/**
 	 * @return the classTrib
 	 */
@@ -236,6 +238,14 @@ public void setIndTribFolhaPisCofins(String indTribFolhaPisCofins) {
 		this.indTribFolhaPisCofins = indTribFolhaPisCofins;
 	}
 
+	public String getIndTribFolhaPisPasep() {
+		return indTribFolhaPisPasep;
+	}
+
+	public void setIndTribFolhaPisPasep(String indTribFolhaPisPasep) {
+		this.indTribFolhaPisPasep = indTribFolhaPisPasep;
+	}
+
 	@Override
 	public int hashCode() {
 		return new HashCodeBuilder()
@@ -249,6 +259,7 @@ public int hashCode() {
 				.append(this.infoOrgInternacional)
 				.append(this.cnpjEFR)
 				.append(this.indTribFolhaPisCofins)
+				.append(this.indTribFolhaPisPasep)
 				.toHashCode();
 	}
 
@@ -276,6 +287,7 @@ public boolean equals(Object obj) {
 				.append(this.infoOrgInternacional, other.infoOrgInternacional)
 				.append(this.cnpjEFR, other.cnpjEFR)
 				.append(this.indTribFolhaPisCofins, other.indTribFolhaPisCofins)
+				.append(this.indTribFolhaPisPasep, other.indTribFolhaPisPasep)
 				.isEquals();
 	}
 }

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/estabelecimentolotacao/DetVerbas.java

@@ -1,5 +1,7 @@
 package br.jus.tst.esocial.dominio.estabelecimentolotacao;
 
+import br.jus.tst.esocial.dominio.folha.DescFolha;
+
 import java.math.BigDecimal;
 
 import javax.validation.constraints.NotNull;
@@ -23,6 +25,8 @@ public class DetVerbas {
 
 	private Byte indApurIR;
 
+	private DescFolha descFolha;
+
 	public String getCodRubr() {
 		return codRubr;
 	}
@@ -70,5 +74,12 @@ public Byte getIndApurIR() {
 	public void setIndApurIR(Byte indApurIR) {
 		this.indApurIR = indApurIR;
 	}
-
+
+	public DescFolha getDescFolha() {
+		return descFolha;
+	}
+
+	public void setDescFolha(DescFolha descFolha) {
+		this.descFolha = descFolha;
+	}
 }

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/estabelecimentolotacao/ItemRemuneracao.java

@@ -1,5 +1,7 @@
 package br.jus.tst.esocial.dominio.estabelecimentolotacao;
 
+import br.jus.tst.esocial.dominio.folha.DescFolha;
+
 import java.math.BigDecimal;
 
 import javax.validation.constraints.NotNull;
@@ -25,6 +27,8 @@ public class ItemRemuneracao {
 
 	private Byte indApurIR;
 
+	private DescFolha descFolha;
+
 	public String getCodRubr() {
 		return codRubr;
 	}
@@ -80,4 +84,12 @@ public Byte getIndApurIR() {
 	public void setIndApurIR(Byte indApurIR) {
 		this.indApurIR = indApurIR;
 	}
+
+	public DescFolha getDescFolha() {
+		return descFolha;
+	}
+
+	public void setDescFolha(DescFolha descFolha) {
+		this.descFolha = descFolha;
+	}
 }

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/folha/DescFolha.java

@@ -0,0 +1,40 @@
+package br.jus.tst.esocial.dominio.folha;
+
+public class DescFolha {
+    private byte tpDesc;
+    private String instFinanc;
+    private String nrDoc;
+    private String observacao;
+
+    public byte getTpDesc() {
+        return tpDesc;
+    }
+
+    public void setTpDesc(byte tpDesc) {
+        this.tpDesc = tpDesc;
+    }
+
+    public String getInstFinanc() {
+        return instFinanc;
+    }
+
+    public void setInstFinanc(String instFinanc) {
+        this.instFinanc = instFinanc;
+    }
+
+    public String getNrDoc() {
+        return nrDoc;
+    }
+
+    public void setNrDoc(String nrDoc) {
+        this.nrDoc = nrDoc;
+    }
+
+    public String getObservacao() {
+        return observacao;
+    }
+
+    public void setObservacao(String observacao) {
+        this.observacao = observacao;
+    }
+}

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/pagamento/IdeBenef.java

@@ -15,7 +15,7 @@ public class IdeBenef {
 	private List<InfoPgto> infoPgto;
 
 	@Valid
-	private InfoIRComplem infoIRComplem;
+	private List<InfoIRComplem> infoIRComplem;
 
 	public String getCpfBenef() {
 		return cpfBenef;
@@ -33,11 +33,11 @@ public void setInfoPgto(List<InfoPgto> infoPgto) {
 		this.infoPgto = infoPgto;
 	}
 
-	public InfoIRComplem getInfoIRComplem() {
+	public List<InfoIRComplem> getInfoIRComplem() {
 		return infoIRComplem;
 	}
 
-	public void setInfoIRComplem(InfoIRComplem infoIRComplem) {
+	public void setInfoIRComplem(List<InfoIRComplem> infoIRComplem) {
 		this.infoIRComplem = infoIRComplem;
 	}
 }

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/pagamento/InfoFech.java

@@ -22,7 +22,7 @@ public class InfoFech {
 
 	private String transDCTFWeb;
 
-	private String naoValid;
+	private SimNao naoValid;
 
 	private SimNao evtPgtos;
 
@@ -74,11 +74,11 @@ public void setTransDCTFWeb(String transDCTFWeb) {
 		this.transDCTFWeb = transDCTFWeb;
 	}
 
-	public String getNaoValid() {
+	public SimNao getNaoValid() {
 		return naoValid;
 	}
 
-	public void setNaoValid(String naoValid) {
+	public void setNaoValid(SimNao naoValid) {
 		this.naoValid = naoValid;
 	}
 

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/pagamento/InfoIRComplem.java

@@ -19,6 +19,9 @@ public class InfoIRComplem {
     @Valid
     private List<InfoReembMed> infoReembMed;
 
+    @Valid
+    private PerAnt perAnt;
+
     public Calendar getDtLaudo() {
         return dtLaudo;
     }
@@ -58,4 +61,12 @@ public List<InfoReembMed> getInfoReembMed() {
     public void setInfoReembMed(List<InfoReembMed> infoReembMed) {
         this.infoReembMed = infoReembMed;
     }
+
+    public PerAnt getPerAnt() {
+        return perAnt;
+    }
+
+    public void setPerAnt(PerAnt perAnt) {
+        this.perAnt = perAnt;
+    }
 }

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/pagamento/PerAnt.java

@@ -0,0 +1,22 @@
+package br.jus.tst.esocial.dominio.pagamento;
+
+public class PerAnt {
+    private String perRefAjuste;
+    private String nrRec1210Orig;
+
+    public String getPerRefAjuste() {
+        return perRefAjuste;
+    }
+
+    public void setPerRefAjuste(String perRefAjuste) {
+        this.perRefAjuste = perRefAjuste;
+    }
+
+    public String getNrRec1210Orig() {
+        return nrRec1210Orig;
+    }
+
+    public void setNrRec1210Orig(String nrRec1210Orig) {
+        this.nrRec1210Orig = nrRec1210Orig;
+    }
+}

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/pagamento/PrevidCompl.java

@@ -11,6 +11,8 @@ public class PrevidCompl {
     @NotNull
     private BigDecimal vlrDedPC;
     private BigDecimal vlrPatrocFunp;
+    private BigDecimal vlrDedPC13;
+    private BigDecimal vlrPatrocFunp13;
 
     public byte getTpPrev() {
         return tpPrev;
@@ -43,4 +45,20 @@ public BigDecimal getVlrPatrocFunp() {
     public void setVlrPatrocFunp(BigDecimal vlrPatrocFunp) {
         this.vlrPatrocFunp = vlrPatrocFunp;
     }
+
+    public BigDecimal getVlrDedPC13() {
+        return vlrDedPC13;
+    }
+
+    public void setVlrDedPC13(BigDecimal vlrDedPC13) {
+        this.vlrDedPC13 = vlrDedPC13;
+    }
+
+    public BigDecimal getVlrPatrocFunp13() {
+        return vlrPatrocFunp13;
+    }
+
+    public void setVlrPatrocFunp13(BigDecimal vlrPatrocFunp13) {
+        this.vlrPatrocFunp13 = vlrPatrocFunp13;
+    }
 }

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/tabela/rubrica/DadosRubrica.java

@@ -35,6 +35,8 @@ public class DadosRubrica {
 	@Size(min = 0, max = 255)
 	private String observacao;
 
+	private String codIncPisPasep;
+
 	@Valid
 	private List<IdeProcessoCP> ideProcessoCP;
 
@@ -44,6 +46,9 @@ public class DadosRubrica {
 	@Valid
 	private List<IdeProcessoFGTS> ideProcessoFGTS;
 
+	@Valid
+	private List<IdeProcessoPisPasep> ideProcessoPisPasep;
+
 	public String getDscRubr() {
 		return dscRubr;
 	}
@@ -140,4 +145,19 @@ public void setIdeProcessoFGTS(List<IdeProcessoFGTS> ideProcessoFGTS) {
 		this.ideProcessoFGTS = ideProcessoFGTS;
 	}
 
+	public String getCodIncPisPasep() {
+		return codIncPisPasep;
+	}
+
+	public void setCodIncPisPasep(String codIncPisPasep) {
+		this.codIncPisPasep = codIncPisPasep;
+	}
+
+	public @Valid List<IdeProcessoPisPasep> getIdeProcessoPisPasep() {
+		return ideProcessoPisPasep;
+	}
+
+	public void setIdeProcessoPisPasep(@Valid List<IdeProcessoPisPasep> ideProcessoPisPasep) {
+		this.ideProcessoPisPasep = ideProcessoPisPasep;
+	}
 }

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/tabela/rubrica/IdeProcessoPisPasep.java

@@ -0,0 +1,24 @@
+package br.jus.tst.esocial.dominio.tabela.rubrica;
+
+import java.math.BigInteger;
+
+public class IdeProcessoPisPasep {
+    private String nrProc;
+    private BigInteger codSusp;
+
+    public String getNrProc() {
+        return nrProc;
+    }
+
+    public void setNrProc(String nrProc) {
+        this.nrProc = nrProc;
+    }
+
+    public BigInteger getCodSusp() {
+        return codSusp;
+    }
+
+    public void setCodSusp(BigInteger codSusp) {
+        this.codSusp = codSusp;
+    }
+}

src/esocial-jt-dominio/src/main/java/br/jus/tst/esocial/dominio/trabalhador/identificacaobasica/InfoInterm.java

@@ -5,6 +5,8 @@ public class InfoInterm {
 	private Byte qtdDiasInterm;
 
 	private Byte dia;
+
+	private String hrsTrab;
 
 	public Byte getQtdDiasInterm() {
 		return qtdDiasInterm;
@@ -22,4 +24,11 @@ public void setDia(Byte dia) {
 		this.dia = dia;
 	}
 
+	public String getHrsTrab() {
+		return hrsTrab;
+	}
+
+	public void setHrsTrab(String hrsTrab) {
+		this.hrsTrab = hrsTrab;
+	}
 }