|
@@ -48,30 +48,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
|
|
|
@Override
|
|
|
public PageInfo pageList(OrderParam param) {
|
|
|
CacheUtil.orderParam = param;
|
|
|
- Page<DownOrderVo> page = this.pageListByParam(param);
|
|
|
- for (DownOrderVo record : page.getRecords()) {
|
|
|
- record.setCreateTime(record.getTradeTime());
|
|
|
- if(StringUtils.isNotBlank(record.getSceneNum())){
|
|
|
- Long cameraId = null;
|
|
|
- ScenePro pro = sceneProService.getByNum(record.getSceneNum());
|
|
|
- if(pro == null){
|
|
|
- ScenePlus plus = scenePlusService.getByNum(record.getSceneNum());
|
|
|
- if(plus!= null){
|
|
|
- cameraId = plus.getCameraId();
|
|
|
- }
|
|
|
- }else {
|
|
|
- cameraId = pro.getCameraId();
|
|
|
- }
|
|
|
- if(cameraId != null){
|
|
|
- Camera camera = cameraService.getById(cameraId);
|
|
|
- if(camera != null){
|
|
|
- record.setSnCode(camera.getSnCode());
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- return PageInfo.PageInfo(page);
|
|
|
+ return PageInfo.PageInfo(this.pageListByParam(param));
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -84,6 +61,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
|
|
|
if(StringUtils.isNotBlank(record.getSceneNum())){
|
|
|
record.setSnCode(snCodeMap.get(record.getSceneNum()));
|
|
|
}
|
|
|
+ record.setCreateTime(record.getTradeTime());
|
|
|
}
|
|
|
return page;
|
|
|
}
|