diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java index e3613742..78a40e18 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java @@ -48,18 +48,14 @@ public class TaskController { @ApiOperation(value = "流程实例明细验证是否完成") @GetMapping("/get_verify_by_instance") public long get_verify_by_instance(String taskId,String pId) { - Map map = new TreeMap<>(); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("TASK_ID",taskId); - queryWrapper.eq("P_ID",pId); - queryWrapper.eq("COMMIT_FLAG","0"); - long count1 = iBusProcessNewService.count(queryWrapper); - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID",taskId); - queryWrapper1.eq("P_ID",pId); - queryWrapper1.eq("FINISH_FLAG","0"); - long count2 = iBusProcessNewService.count(queryWrapper1); - return count1 + count2; + HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery() + .processInstanceId(pId).taskId(taskId).finished(); + List list = historicTaskInstanceQuery.list(); + long count = 0; + if(!list.isEmpty()){ + count = list.size(); + } + return count; }