CaiXiang/SPC
1
0
포크 0
코드 이슈 풀 리퀘스트 릴리즈 위키 활동

Merge pull request 'yanyang' (#17) from yanyang into master

소스 검색 
Reviewed-on: #17
This commit is contained in:
闫阳 2023-01-03 16:26:30 +08:00
커밋 5e32971f26
1개의 변경된 파일과 14개의 추가작업 그리고 4개의 파일을 삭제
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
파일 보기

@ -156,10 +156,20 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
List<ProductFeaturesDTO> inspectionSheetFeaturesList = getInspectionSheetFeaturesList(params);
if (inspectionSheetFeaturesList != null && inspectionSheetFeaturesList.size() != 0) {
//分组样本数=样本大小=检验特性分组数的最大值
Integer numbersOfSamples = inspectionSheetFeaturesList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize();
if (numbersOfSamples != null) {
dto.setNumberOfGroupedSamples(numbersOfSamples);
dto.setNumberOfSamples(numbersOfSamples);
//Integer numbersOfSamples = inspectionSheetFeaturesList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize();
//过滤计量型特性
List<ProductFeaturesDTO> featuresList = inspectionSheetFeaturesList.stream().filter(s->s.getType()==1).collect(Collectors.toList());
if(featuresList != null && featuresList.size() != 0) {
Integer numbersOfSamples = featuresList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize();
if (numbersOfSamples != null) {
dto.setNumberOfGroupedSamples(numbersOfSamples);
dto.setNumberOfSamples(numbersOfSamples);
}
}
//若只有计数型特性，样本大小默认为1
else{
dto.setNumberOfGroupedSamples(1);
dto.setNumberOfSamples(1);
}
}
/*