|
|
@@ -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(); |
|
|
|