Index: grails-app/services/com/lemans/ds/qualitycontrol/PartReviewService.groovy =================================================================== diff -u -re50ff0656e01e68bd92383c18ccc24b5f7f60c90 -r861152b98e93ae3edd5f0dc891620b335393aa9c --- grails-app/services/com/lemans/ds/qualitycontrol/PartReviewService.groovy (.../PartReviewService.groovy) (revision e50ff0656e01e68bd92383c18ccc24b5f7f60c90) +++ grails-app/services/com/lemans/ds/qualitycontrol/PartReviewService.groovy (.../PartReviewService.groovy) (revision 861152b98e93ae3edd5f0dc891620b335393aa9c) @@ -996,10 +996,10 @@ def (years, fitmentPositions, models, makes, qcYears, qcFitmentPositions) = futures.parallelStream().map { it.join() }.collect(Collectors.toList()) Map qcFitmentsByYear = qcYears.groupBy({ it.modelId }, { it.year }) - List mergedPartFitmentYears = (years.collect { - List entities = qcFitmentsByYear?.getAt(it.modelId)?.getAt(it.year) - new QCFitmentYear(it + [ entities: entities]) - } + qcYears.findAll { it.entityField == 'dateDeleted' }.collect { new QCFitmentYear(it + [entities: [it]]) }).unique{ it.changeLogIds } + List mergedPartFitmentYears = years.collect { + List entities = qcFitmentsByYear?.getAt(it.modelId)?.getAt(it.year) + new QCFitmentYear(it + [entities: entities]) + } + qcYears.findAll { it.entityField == 'dateDeleted' }.collect { new QCFitmentYear(it + [entities: [it]]) } Map qcFitmentPositionsByPosition = qcFitmentPositions.groupBy({ it.modelId }, { it.year }, { it.positionTypeId }) List mergedPartFitmentPositions = fitmentPositions.collect {