|
@@ -41,6 +41,9 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
|
|
|
private EhsdQualityAqlService ehsdQualityAqlService;
|
|
|
|
|
|
@Autowired
|
|
|
+ private EhsdQualityMarkingDetailService ehsdQualityMarkingDetailService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
private EhsdQualityProblemService ehsdQualityProblemService;
|
|
|
|
|
|
@Autowired
|
|
@@ -82,6 +85,7 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
|
|
|
throw new ServiceException("质检单不存在");
|
|
|
}
|
|
|
quality.setEhsdQualityAqlList(ehsdQualityAqlService.list(Wrappers.<EhsdQualityAql>query().lambda()));
|
|
|
+ quality.setEhsdQualityMarkingDetails(ehsdQualityMarkingDetailService.list(Wrappers.<EhsdQualityMarkingDetail>query().lambda()));
|
|
|
quality.setEhsdQualityProblemList(ehsdQualityProblemService.list(Wrappers.<EhsdQualityProblem>query().lambda().eq(EhsdQualityProblem::getQualityId,id)));
|
|
|
quality.setEhsdQualitySiteTestList(ehsdQualitySiteTestService.list(Wrappers.<EhsdQualitySiteTest>query().lambda().eq(EhsdQualitySiteTest::getQualityId,id)));
|
|
|
quality.setEhsdQualityPackList(ehsdQualityPackService.list(Wrappers.<EhsdQualityPack>query().lambda().eq(EhsdQualityPack::getQualityId,id)));
|
|
@@ -110,6 +114,7 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
|
|
|
this.updateById(ehsdQualityDto);
|
|
|
//清空数据
|
|
|
ehsdQualityAqlService.remove(Wrappers.<EhsdQualityAql>query().lambda().eq(EhsdQualityAql::getQualityId,ehsdQualityDto.getId()));
|
|
|
+ ehsdQualityMarkingDetailService.remove(Wrappers.<EhsdQualityMarkingDetail>query().lambda().eq(EhsdQualityMarkingDetail::getQualityId,ehsdQualityDto.getId()));
|
|
|
ehsdQualityProductService.remove(Wrappers.<EhsdQualityProduct>query().lambda().eq(EhsdQualityProduct::getQualityId,ehsdQualityDto.getId()));
|
|
|
ehsdQualityWorkshipService.remove(Wrappers.<EhsdQualityWorkship>query().lambda().eq(EhsdQualityWorkship::getQualityId,ehsdQualityDto.getId()));
|
|
|
ehsdQualityCartonsService.remove(Wrappers.<EhsdQualityCartons>query().lambda().eq(EhsdQualityCartons::getQualityId,ehsdQualityDto.getId()));
|
|
@@ -152,6 +157,10 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
|
|
|
ehsdQualityDto.getEhsdQualitySiteTestList().forEach(object -> object.setQualityId(ehsdQualityDto.getId()));
|
|
|
ehsdQualitySiteTestService.saveBatch(ehsdQualityDto.getEhsdQualitySiteTestList());
|
|
|
}
|
|
|
+ if(CollectionUtils.isNotEmpty(ehsdQualityDto.getEhsdQualityMarkingDetails())){
|
|
|
+ ehsdQualityDto.getEhsdQualityMarkingDetails().forEach(object -> object.setQualityId(ehsdQualityDto.getId()));
|
|
|
+ ehsdQualityMarkingDetailService.saveBatch(ehsdQualityDto.getEhsdQualityMarkingDetails());
|
|
|
+ }
|
|
|
//样品采集记录文件列表
|
|
|
if(CollectionUtils.isNotEmpty(ehsdQualityDto.getSampleCollectionRecordFileList())){
|
|
|
ObsFileUtil.saveFile(ehsdQualityDto.getSampleCollectionRecordFileList(), ehsdQualityDto.getId(),FileTypeEnums.FILE_TYPE_10.getKey());
|