|
@@ -67,7 +67,10 @@ public class ShowDataController {
|
|
|
}
|
|
|
List<ResultOriginData> resultOriginDataList = resultOriginDataService.list(resultOriginDataQueryWrapper);
|
|
|
resultOriginDataList.forEach(p -> sns.add(p.getDeviceId()));
|
|
|
- sns.forEach(p -> {
|
|
|
+ List<ResultInfo> resultInfos = resultInfoService.list(new QueryWrapper<ResultInfo>().in("sn", sns).orderBy(true, false, "status"));
|
|
|
+ List<String> sns2 = new ArrayList<>();
|
|
|
+ resultInfos.forEach(p -> sns2.add(p.getSn()));
|
|
|
+ sns2.forEach(p -> {
|
|
|
QueryParam param1 = new QueryParam();
|
|
|
param1.setSn(p);
|
|
|
|