Compare commits
No commits in common. "37f0dbe54841e3b1ab1eb3c4affe7705bbbdfe9a" and "1173d670e4018043e7be0232f44623cdd086825b" have entirely different histories.
37f0dbe548
...
1173d670e4
@ -175,10 +175,9 @@ public class InspectionSheetController {
|
||||
|
||||
@PostMapping("saveFluxParamList")
|
||||
@ApiOperation("将样本检测参数写入influxdb")
|
||||
public Result saveFluxParamList(@RequestBody InspectionSampleDTO[] lists) throws InterruptedException{
|
||||
public Result saveFluxParamList(@RequestBody InspectionSampleDTO[] lists){
|
||||
|
||||
inspectionSheetService.saveFluxParamList(lists);
|
||||
Thread.sleep(1000);
|
||||
//样本数据更新后 计算检验单缺陷数不良数
|
||||
inspectionSheetService.calculate(Long.valueOf(lists[0].getInspectionSheetId()));
|
||||
return new Result();
|
||||
|
@ -252,11 +252,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
|
||||
list.add(sampleDTO);
|
||||
}
|
||||
}
|
||||
//返回先按时间排序 再按样本号排序
|
||||
List<InspectionSampleDTO> sortedList = list.stream()
|
||||
.sorted(Comparator.comparing(InspectionSampleDTO::getSampleTime).thenComparing(InspectionSampleDTO::getSampleNumber))
|
||||
.collect(Collectors.toList());
|
||||
return sortedList;
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Loading…
Reference in New Issue
Block a user