|
@@ -97,8 +97,7 @@ public class SceneService implements ISceneService {
|
|
}
|
|
}
|
|
List<CaseNumEntity> list = caseNumService.list();
|
|
List<CaseNumEntity> list = caseNumService.list();
|
|
List<String> collect = list.stream().map(CaseNumEntity::getNum).collect(Collectors.toList());
|
|
List<String> collect = list.stream().map(CaseNumEntity::getNum).collect(Collectors.toList());
|
|
- Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
|
|
|
|
- for (SceneVo record : voPage.getRecords()) {
|
|
|
|
|
|
+ for (SceneVo record : page.getRecords()) {
|
|
if(record.getSceneType().equals("4dkankan")){
|
|
if(record.getSceneType().equals("4dkankan")){
|
|
record.setStatus(setLaserStatus(record.getStatus(),record.getPayStatus()));
|
|
record.setStatus(setLaserStatus(record.getStatus(),record.getPayStatus()));
|
|
}
|
|
}
|
|
@@ -113,9 +112,7 @@ public class SceneService implements ISceneService {
|
|
record.setIsLaser(false);
|
|
record.setIsLaser(false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- voPage.setRecords(page.getRecords());
|
|
|
|
- voPage.setTotal(page.getTotal());
|
|
|
|
- return PageInfo.PageInfo(voPage);
|
|
|
|
|
|
+ return PageInfo.PageInfo(page);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|