diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 4d40d843..8a40d987 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -1777,20 +1777,49 @@ public class TodoTaskController extends BaseAction { /** * 查询第index步 - * @param bpnId + * @param prcId * @return */ - @ApiOperation(value = "查询index步") + @ApiOperation(value = "查询汇总项") @GetMapping("/queryTaskIndex") - public BusProcessName queryTaskIndex(String bpnId,Integer index) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("ID", bpnId); - List list = iBusProcessNameService.list(queryWrapper); - if (list.size() > 0) { - return list.get(index); + public BusProcessNew queryTaskIndex(String prcId) { + QueryWrapper q=new QueryWrapper<>(); + List list = iBusProcessNewService.list(q.eq("P_ID", prcId)); + if (list.size()>0) { + for (BusProcessNew bpn:list) { + if (bpn.getTaskInfo().equals("起草")) { + // 标准入库流程数据 + return bpn; + }else if(bpn.getTaskInfo().equals("批准")){ + //企标入库 + return bpn; + }else if(bpn.getTaskInfo().equals("意见汇总修订") ){ + //企标入库 + return bpn; + }else if(bpn.getTaskInfo().equals("汇总") ){ + //企标复审 + return bpn; + } else if (bpn.getTaskInfo().equals("合规排查(上传合规举证材料)") ) { + // 未符合项整改 + return bpn; + }else if(bpn.getTaskInfo().equals("调研结果处理") ){ + //标准调研流程 + return bpn; + }else if(bpn.getTaskInfo().equals("意见处理") ){ + //标准征求意见 + return bpn; + }else if(bpn.getTaskInfo().equals("清单发布") ){ + //项目清单确认 + return bpn; + }else if(bpn.getTaskInfo().equals("起草人修改标准状态") ) { + //企标废止 + return bpn; + } + } } else { return null; } + return null; } /**