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

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

Browse Source 
Reviewed-on: #15
This commit is contained in:
闫阳 2022-12-12 16:02:45 +08:00
commit 37f0dbe548
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java
View File

@ -175,9 +175,10 @@ public class InspectionSheetController {
@PostMapping("saveFluxParamList") @PostMapping("saveFluxParamList")
@ApiOperation("将样本检测参数写入influxdb") @ApiOperation("将样本检测参数写入influxdb")
public Result saveFluxParamList(@RequestBody InspectionSampleDTO[] lists){ public Result saveFluxParamList(@RequestBody InspectionSampleDTO[] lists) throws InterruptedException{
inspectionSheetService.saveFluxParamList(lists); inspectionSheetService.saveFluxParamList(lists);
Thread.sleep(1000);
//样本数据更新后 计算检验单缺陷数不良数 //样本数据更新后 计算检验单缺陷数不良数
inspectionSheetService.calculate(Long.valueOf(lists[0].getInspectionSheetId())); inspectionSheetService.calculate(Long.valueOf(lists[0].getInspectionSheetId()));
return new Result(); return new Result();

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

@ -252,7 +252,11 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
list.add(sampleDTO); list.add(sampleDTO);
} }
} }
return list; //返回先按时间排序 再按样本号排序
List<InspectionSampleDTO> sortedList = list.stream()
.sorted(Comparator.comparing(InspectionSampleDTO::getSampleTime).thenComparing(InspectionSampleDTO::getSampleNumber))
.collect(Collectors.toList());
return sortedList;
} }
@Override @Override