branch develop updated (e5ed78f -> d89f57a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from e5ed78f utilisation de la même unité que celle du modèle (refs #7039) new d89f57a consolidation des espèces de tous les lots avant l'import (refs #7042) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d89f57ab9b522d2947471d6cb88b847a67ee60eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 1 11:20:57 2015 +0200 consolidation des espèces de tous les lots avant l'import (refs #7042) Summary of changes: .../ifremer/tutti/service/bigfin/BigfinImportService.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit d89f57ab9b522d2947471d6cb88b847a67ee60eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 1 11:20:57 2015 +0200 consolidation des espèces de tous les lots avant l'import (refs #7042) --- .../ifremer/tutti/service/bigfin/BigfinImportService.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java index 3b71d00..92c8e33 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java @@ -169,7 +169,8 @@ public class BigfinImportService extends AbstractTuttiService { Integer referenceTaxonId = species.getReferenceTaxonId(); Preconditions.checkNotNull(referenceTaxonId, "Can't have a null referenceTaxonId for species: " + species); Species species1 = speciesByReferenceTaxonId.get(referenceTaxonId.toString()); - speciesBatch.setSpecies(species1); + consolidateSpecies(speciesBatch, species1); + } } @@ -179,6 +180,18 @@ public class BigfinImportService extends AbstractTuttiService { } + protected void consolidateSpecies(SpeciesBatch speciesBatch, Species species) { + + speciesBatch.setSpecies(species); + if (!speciesBatch.isChildBatchsEmpty()) { + + for (SpeciesBatch childBatch : speciesBatch.getChildBatchs()) { + consolidateSpecies(childBatch, species); + } + } + + } + public BigfinImportResult importFile(File importFile, FishingOperation operation, CatchBatch catchBatch) { Preconditions.checkNotNull(importFile); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm