Resolução de conflito no merge;

luis.camargo
1 parent 48ca806d
Showing 1 changed file with 10 additions and 0 deletions Show diff stats
cit-contratos-api/src/main/java/br/com/centralit/api/service/impl/ContratoEventoServiceImpl.java
@@ -422,6 +422,16 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl&lt;ContratoEvento
 		return jasperPrint;
 	}
  
+	private JasperPrint addJasperPrint(JasperPrint jasperPrint, List<JasperPrint> jasperPrints, JasperPrint jasperPrincipal, Integer index) {
+
+		if (index.equals(1)) {
+			jasperPrincipal = jasperPrint;
+		} else {
+			jasperPrints.add(jasperPrint);
+		}
+		return jasperPrincipal;
+	}
+
 	private List<Long> obtemIdsContratosPorEvento(Long[] idsTipoEvento) {
 		Collection<ContratoEvento> contratoEventos = contratoEventoDao.findAllByTipoEvento(Arrays.asList(idsTipoEvento));
 		List<Long> idsContratos = new ArrayList<Long>();
...	...	@@ -422,6 +422,16 @@ public class ContratoEventoServiceImpl extends GenericServiceImpl<ContratoEvento
422	422	return jasperPrint;
423	423	}
424	424
	425	+ private JasperPrint addJasperPrint(JasperPrint jasperPrint, List<JasperPrint> jasperPrints, JasperPrint jasperPrincipal, Integer index) {
	426	+
	427	+ if (index.equals(1)) {
	428	+ jasperPrincipal = jasperPrint;
	429	+ } else {
	430	+ jasperPrints.add(jasperPrint);
	431	+ }
	432	+ return jasperPrincipal;
	433	+ }
	434	+
425	435	private List<Long> obtemIdsContratosPorEvento(Long[] idsTipoEvento) {
426	436	Collection<ContratoEvento> contratoEventos = contratoEventoDao.findAllByTipoEvento(Arrays.asList(idsTipoEvento));
427	437	List<Long> idsContratos = new ArrayList<Long>();
...	...