diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/controller/HomePageController.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/controller/HomePageController.java index e52ac44..366851b 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/controller/HomePageController.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/controller/HomePageController.java @@ -79,7 +79,7 @@ public class HomePageController extends BladeController { } /** - * 状态统计,还未完成 + * 状态统计 */ @GetMapping("/flowStatus") @ApiOperationSupport(order = 4) diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java index 87ab9ff..f204503 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java @@ -498,7 +498,8 @@ public class HomePageServiceImpl implements IHomePageService { while(iterator.hasNext()){ Map.Entry next = iterator.next(); JSONObject jsonObject = new JSONObject(); - jsonObject.put(next.getKey(),next.getValue()); + jsonObject.put("name",next.getKey()); + jsonObject.put("value",next.getValue()); result.add(jsonObject); } return R.data(result); diff --git a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/WorkBenchServiceImpl.java b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/WorkBenchServiceImpl.java index 8090e6c..62631b4 100644 --- a/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/WorkBenchServiceImpl.java +++ b/lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/WorkBenchServiceImpl.java @@ -47,12 +47,14 @@ public class WorkBenchServiceImpl implements IWorkBenchService { } }).collect(Collectors.toList()); - //将到期任务按照提醒类型分类 - collect.forEach(cl ->{ - Map variableMap = cl.getProcessVariables(); - if(Func.isNotEmpty(variableMap.get("tixingmoshi")) && Func.isNotBlank(variableMap.get("tixingmoshi").toString())){ - } - }); + +// //将到期任务按照提醒类型分类 +// collect.forEach(cl ->{ +// Map variableMap = cl.getProcessVariables(); +// if(Func.isNotEmpty(variableMap.get("tixingmoshi")) && Func.isNotBlank(variableMap.get("tixingmoshi").toString())){ +// +// } +// }); } }