1.首页"状态统计"返回的数据格式修改

main
yitonglei 3 years ago
parent 92565f842e
commit 0ed12af66e
  1. 2
      lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/controller/HomePageController.java
  2. 3
      lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/homepage/service/impl/HomePageServiceImpl.java
  3. 14
      lab-plugin/lab-workflow/src/main/java/org/springblade/plugin/workbench/service/impl/WorkBenchServiceImpl.java

@ -79,7 +79,7 @@ public class HomePageController extends BladeController {
} }
/** /**
* 状态统计,还未完成 * 状态统计
*/ */
@GetMapping("/flowStatus") @GetMapping("/flowStatus")
@ApiOperationSupport(order = 4) @ApiOperationSupport(order = 4)

@ -498,7 +498,8 @@ public class HomePageServiceImpl implements IHomePageService {
while(iterator.hasNext()){ while(iterator.hasNext()){
Map.Entry<String, Integer> next = iterator.next(); Map.Entry<String, Integer> next = iterator.next();
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put(next.getKey(),next.getValue()); jsonObject.put("name",next.getKey());
jsonObject.put("value",next.getValue());
result.add(jsonObject); result.add(jsonObject);
} }
return R.data(result); return R.data(result);

@ -47,12 +47,14 @@ public class WorkBenchServiceImpl implements IWorkBenchService {
} }
}).collect(Collectors.toList()); }).collect(Collectors.toList());
//将到期任务按照提醒类型分类
collect.forEach(cl ->{
Map<String, Object> variableMap = cl.getProcessVariables();
if(Func.isNotEmpty(variableMap.get("tixingmoshi")) && Func.isNotBlank(variableMap.get("tixingmoshi").toString())){
}
}); // //将到期任务按照提醒类型分类
// collect.forEach(cl ->{
// Map<String, Object> variableMap = cl.getProcessVariables();
// if(Func.isNotEmpty(variableMap.get("tixingmoshi")) && Func.isNotBlank(variableMap.get("tixingmoshi").toString())){
//
// }
// });
} }
} }

Loading…
Cancel
Save