CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC

Browse Source
This commit is contained in:
caixiang
2022-12-12 16:08:49 +08:00
parent 7e3e028eb0 37f0dbe548
commit 5e8110ad2c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java
View File

@@ -252,11 +252,15 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
list.add(sampleDTO);
}
}
return list;
//返回先按时间排序 再按样本号排序
List<InspectionSampleDTO> sortedList = list.stream()
.sorted(Comparator.comparing(InspectionSampleDTO::getSampleTime).thenComparing(InspectionSampleDTO::getSampleNumber))
.collect(Collectors.toList());
return sortedList;
}
@Override
public void saveFluxParamList(InspectionSampleDTO[] lists) {
public void saveFluxParamList(InspectionSampleDTO[] lists){
for (InspectionSampleDTO dto : lists) {
//String jsonData = {"workingProcedureName":"test","inspectionSheetId":"116","param1":"0.47","param2":"0.687","param2":"0.53"};
String workingProcedureName = dto.getWorkingProcedureName();