branch develop updated (28ab226 -> f92468b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 28ab226 [ERGO] libellés à améliorer (Livrable #8306) new 83e8129 Correction de l'id des lots à utiliser lors de l'import générique (Livrable #8309) new f92468b Autoriser de lier une personne temporaire même si on la trouve plusieurs fois (See #8310) The 2 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 f92468b3609cca1faffd0d1f405fe8dcd4063255 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 18:23:58 2016 +0200 Autoriser de lier une personne temporaire même si on la trouve plusieurs fois (See #8310) commit 83e81291e30f3cbb8aa6d15c39e0c2604304dd83 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 18:20:01 2016 +0200 Correction de l'id des lots à utiliser lors de l'import générique (Livrable #8309) Summary of changes: .../referential/PersonPersistenceServiceImpl.java | 25 +++++++++++++++++++++- .../consumer/CsvConsumerForCatch.java | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) -- 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 https://gitlab.nuiton.org/codelutin/tutti.git commit 83e81291e30f3cbb8aa6d15c39e0c2604304dd83 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 18:20:01 2016 +0200 Correction de l'id des lots à utiliser lors de l'import générique (Livrable #8309) --- .../tutti/service/genericformat/consumer/CsvConsumerForCatch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java index 5edbf93..5e38405 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java @@ -295,7 +295,7 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { result.setSampleCategoryWeight(sampleCategory.getCategoryWeight()); result.setWeight(sampleCategory.getSampleWeight()); result.setComment(sampleCategory.getComment()); - operationContext.registerBatchObjectId(batch.getIdAsInt(), sampleCategory.getBatchId()); + operationContext.registerBatchObjectId(result.getIdAsInt(), sampleCategory.getBatchId()); if (log.isInfoEnabled()) { log.info("Create child batch for batch: " + batch.getSpecies().getName() + " - " + batch.getSampleCategoryId() + " - " + batch.getSampleCategoryValue()); } -- 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 https://gitlab.nuiton.org/codelutin/tutti.git commit f92468b3609cca1faffd0d1f405fe8dcd4063255 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 18:23:58 2016 +0200 Autoriser de lier une personne temporaire même si on la trouve plusieurs fois (See #8310) --- .../referential/PersonPersistenceServiceImpl.java | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java index f4f9935..daf1dba 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java @@ -34,6 +34,8 @@ import fr.ifremer.adagio.core.dao.referential.StatusCode; import fr.ifremer.adagio.core.vo.administration.user.PersonVO; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Persons; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; import org.hibernate.type.StringType; import org.nuiton.jaxx.application.ApplicationBusinessException; @@ -54,6 +56,9 @@ import java.util.List; @Service("personPersistenceService") public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceSupport implements PersonPersistenceService { + /** Logger. */ + private static final Log log = LogFactory.getLog(PersonPersistenceServiceImpl.class); + @Resource(name = "personDao") protected PersonExtendDao personDao; @@ -280,11 +285,29 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS Preconditions.checkNotNull(source.getId()); Preconditions.checkArgument(Persons.isTemporaryId(source.getIdAsInt())); - Object[] row = queryUniqueWithStatus( + Iterator<Object[]> sources =queryListWithStatus( "personByFullName", "personFirstName", StringType.INSTANCE, source.getFirstName(), "personLastName", StringType.INSTANCE, source.getLastName()); + Object[] row = null; + if (sources.hasNext()) { + row = sources.next(); + + if (sources.hasNext()) { + Object[] next = sources.next(); + Person person = loadPerson(next); + if (log.isInfoEnabled()) { + log.info("Il existe une autre personne d'identifiant "+person.getId()+" trouvée en pase pour la personne temporaire "+source.getFirstName()+" - "+source.getLastName()); + } + } + } + +// Object[] row = queryUniqueWithStatus( +// "personByFullName", +// "personFirstName", StringType.INSTANCE, source.getFirstName(), +// "personLastName", StringType.INSTANCE, source.getLastName()); + return row == null ? null : loadPerson(row); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm