|
|
@@ -53,7 +53,7 @@ public class StorageDeviceRepairController {
|
|
53
|
53
|
@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
|
|
54
|
54
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
|
|
55
|
55
|
})
|
|
56
|
|
- public PageInfo<StorageDevicerepair> listCheckPage(HttpServletRequest request,Integer pageNum, Integer pageSize ,Integer repairStatus) throws Exception{
|
|
|
56
|
+ public PageInfo<StorageDevicerepair> listCheckPage(Integer pageNum, Integer pageSize ,Integer repairStatus, String deviceName) throws Exception{
|
|
57
|
57
|
|
|
58
|
58
|
|
|
59
|
59
|
StorageDevicerepairExample storageDevicerepairExample=new StorageDevicerepairExample();
|
|
|
@@ -63,6 +63,10 @@ public class StorageDeviceRepairController {
|
|
63
|
63
|
criteria.andRepairStatusEqualTo(repairStatus);
|
|
64
|
64
|
}
|
|
65
|
65
|
|
|
|
66
|
+ if(ParameterUtil.isnotnull(deviceName)){
|
|
|
67
|
+ criteria.andDeviceNameLike(deviceName);
|
|
|
68
|
+ }
|
|
|
69
|
+
|
|
66
|
70
|
//按照id进行降序
|
|
67
|
71
|
storageDevicerepairExample.setOrderByClause("FIELD(repair_status,1,2,0),repair_end desc,id desc");
|
|
68
|
72
|
|