...
|
...
|
@@ -39,7 +39,8 @@ public class TkCheckPlanController extends BaseController { |
39
|
39
|
@RequestParam(PAGE_SIZE) int pageSize,
|
40
|
40
|
@RequestParam(PAGE) int page,
|
41
|
41
|
@RequestParam(value = "name", required = false) String name,
|
42
|
|
- @RequestParam(value = "type", required = false) TkCheckPlanTypeEnum type
|
|
42
|
+ @RequestParam(value = "type", required = false) TkCheckPlanTypeEnum type,
|
|
43
|
+ @RequestParam(value = "status", required = false) TkCheckPlanStatusEnum status
|
43
|
44
|
) throws ThingsboardException {
|
44
|
45
|
Map<String, Object> queryMap = new HashMap<>();
|
45
|
46
|
queryMap.put(PAGE_SIZE, pageSize);
|
...
|
...
|
@@ -52,6 +53,10 @@ public class TkCheckPlanController extends BaseController { |
52
|
53
|
queryMap.put("type", type);
|
53
|
54
|
}
|
54
|
55
|
|
|
56
|
+ if (status != null) {
|
|
57
|
+ queryMap.put("status", status);
|
|
58
|
+ }
|
|
59
|
+
|
55
|
60
|
return tkCheckPlanService.page(queryMap, getCurrentUser().isTenantAdmin());
|
56
|
61
|
}
|
57
|
62
|
|
...
|
...
|
|