|
@@ -354,7 +354,10 @@ public class ApiAppDeviceLogController {
|
|
|
@RequestMapping(value = "transferBack/pageQuery", method = RequestMethod.POST)
|
|
|
public ApiPageDTO transferBackPageQuery(@RequestBody TransferBySnQueryParam param) {
|
|
|
|
|
|
- param.addParam(QueryParamExp.eq("status", 3));
|
|
|
+ List<Integer> statusList = new ArrayList<>();
|
|
|
+ statusList.add(2);
|
|
|
+ statusList.add(3);
|
|
|
+ param.addParam(QueryParamExp.in("status", statusList.toArray(new Integer[]{})));
|
|
|
Page<AppDevice> devicePage = appDeviceService.findByParam(param);
|
|
|
return new ApiPageDTO(null, devicePage);
|
|
|
}
|
|
@@ -516,8 +519,9 @@ public class ApiAppDeviceLogController {
|
|
|
res.put("handleType", p.getHfEvent());
|
|
|
res.put("handleTime", device.getHandleTime());
|
|
|
res.put("handleProduct", 1);
|
|
|
+ resList.add(res);
|
|
|
});
|
|
|
- return new ApiPageDTO(null,devicePage);
|
|
|
+ return new ApiPageDTO(null,resList);
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "处置 查看")
|