|
@@ -140,7 +140,10 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
|
|
List<CommissionDetail> commissionDetails = JSON.parseArray(array.toJSONString(), CommissionDetail.class)
|
|
List<CommissionDetail> commissionDetails = JSON.parseArray(array.toJSONString(), CommissionDetail.class)
|
|
.stream()
|
|
.stream()
|
|
.filter(item -> StrUtil.isNotBlank(item.getSampleType()))
|
|
.filter(item -> StrUtil.isNotBlank(item.getSampleType()))
|
|
- .peek(item -> item.setInspectionCommissionId(commission.getId()))
|
|
|
|
|
|
+ .peek(item -> {
|
|
|
|
+ item.setId(null);
|
|
|
|
+ item.setInspectionCommissionId(commission.getId());
|
|
|
|
+ })
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
commissionDetailService.saveBatch(commissionDetails);
|
|
commissionDetailService.saveBatch(commissionDetails);
|
|
}
|
|
}
|
|
@@ -175,7 +178,10 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
|
|
}
|
|
}
|
|
|
|
|
|
List<SampleCheckItem> sampleCheckItems = JSON.parseArray(array.toJSONString(), SampleCheckItem.class);
|
|
List<SampleCheckItem> sampleCheckItems = JSON.parseArray(array.toJSONString(), SampleCheckItem.class);
|
|
- sampleCheckItems.forEach(item -> item.setCheckOrderId(order.getId()));
|
|
|
|
|
|
+ sampleCheckItems.forEach(item -> {
|
|
|
|
+ item.setId(null);
|
|
|
|
+ item.setCheckOrderId(order.getId());
|
|
|
|
+ });
|
|
sampleCheckItemService.saveBatch(sampleCheckItems);
|
|
sampleCheckItemService.saveBatch(sampleCheckItems);
|
|
}
|
|
}
|
|
|
|
|