新增/decodeDetail接口

标准解读流程的汇总详情

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java

@@ -186,23 +186,23 @@ public class TaskController {
 		queryWrapper.eq("PRC_NUM",prcNum);
 		Boolean isGather=false;
 		Integer index=-1;
-		Map<String,String> typeDate=new HashMap<>();
-		typeDate.put("1","起草");// 标准入库流程数据
-		typeDate.put("buss1","批准");//企标入库
-		typeDate.put("buss2","意见汇总修订");//企标入库
-		typeDate.put("buss3","汇总");//企标复审
-		typeDate.put("4","起草");//标准清单发布流程数据
-		typeDate.put("5","批准");//标准项目合规评估
-		typeDate.put("6","批准");//标准项目合规评估 项目维度
-		typeDate.put("8","合规排查(上传合规举证材料)");// 未符合项整改
-		typeDate.put("9","批准");// 标准解读流程
-		typeDate.put("2","调研结果处理");//标准调研流程
-		typeDate.put("3","意见处理");//标准征求意见
-		typeDate.put("10","清单发布");//项目清单确认
-		typeDate.put("24","起草人修改标准状态");//企标废止
-		typeDate.put("25","起草");//企标制修订计划管控
-		typeDate.put("26","起草");//企标制修订立项计划
-		typeDate.put("23","汇总");//企标复审
+		Map<String,String> typeData=new HashMap<>();
+		typeData.put("1","起草");// 标准入库流程数据
+		typeData.put("buss1","批准");//企标入库
+		typeData.put("buss2","意见汇总修订");//企标入库
+		typeData.put("buss3","汇总");//企标复审
+		typeData.put("4","起草");//标准清单发布流程数据
+		typeData.put("5","批准");//标准项目合规评估
+		typeData.put("6","批准");//标准项目合规评估 项目维度
+		typeData.put("8","合规排查(上传合规举证材料)");// 未符合项整改
+		typeData.put("9","批准");// 标准解读流程
+		typeData.put("2","调研结果处理");//标准调研流程
+		typeData.put("3","意见处理");//标准征求意见
+		typeData.put("10","清单发布");//项目清单确认
+		typeData.put("24","起草人修改标准状态");//企标废止
+		typeData.put("25","起草");//企标制修订计划管控
+		typeData.put("26","起草");//企标制修订立项计划
+		typeData.put("23","汇总");//企标复审
 		BusProcessName one = iBusProcessNameService.getOne(queryWrapper);
 		HistoricTaskInstanceQuery historicTaskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
 				.processInstanceId(one.getPrcId()).orderByHistoricTaskInstanceEndTime().asc();
@@ -276,7 +276,7 @@ public class TaskController {
 			String prcType=historicTaskInstance.get("prcType").toString();
 			String name=historicTaskInstance.get("name").toString();
 			Boolean endTime=historicTaskInstance.get("endTime")!=null;
-			if (typeDate.get(prcType).equals(name)) {
+			if (typeData.get(prcType).equals(name)) {
 				if(endTime) {
 					isGather = true;
 					index = i;

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java

@@ -597,7 +597,6 @@ public class TodoTaskController extends BaseAction {
             }
         }
 
-
         JSONObject object3 = JSONObject.parseObject(list.get(0).getMesg());
         JSONArray arr2 = new JSONArray();
         object3.put("taskBreak", arr2);
@@ -609,6 +608,7 @@ public class TodoTaskController extends BaseAction {
         long count = oaTaskExecService.count(wrapper);
         processNew.setCommitStatus(count);
         return processNew;
+
     }
 
     /**
@@ -1775,6 +1775,52 @@ public class TodoTaskController extends BaseAction {
         }
     }
 
+
+    @ApiOperation(value = "解读流程汇总详情")
+    @GetMapping("/decodeDetail")
+    public BusProcessNew Detail(String taskIds, String pId) {
+        QueryWrapper<BusProcessNew> q=new QueryWrapper<>();
+        Map<String,JSONObject> msgData =new HashMap<>();
+        List<String> nameData=new ArrayList<>();
+        List<BusProcessNew> listData = iBusProcessNewService.list(q.eq("P_ID", pId));
+        for (BusProcessNew bpn:listData) {
+            if(bpn.getTaskInfo().equals("审核")){
+                nameData.add(bpn.getUserId());
+                msgData.put(bpn.getUserId(),JSONObject.parseObject(bpn.getMesg()));
+            }
+        }
+        JSONArray jsonArray=new JSONArray();
+        for (String name:nameData) {
+            jsonArray.addAll(msgData.get(name).getJSONArray("itemList"));
+        }
+        List<String> taskIdList = new ArrayList<>(Arrays.asList(taskIds.split(",")));
+        List<BusProcessNew> list = iBusProcessNewService.findNoExecuteBusProcessNewForEnd(taskIdList);
+        if (list.isEmpty()) {
+            return null;
+        }
+        BusProcessNew processNew = new BusProcessNew();
+        BeanUtils.copyProperties(list.get(0), processNew);
+        if(StringUtils.isNotBlank(pId)){
+            List<Task> list2 = taskService.createTaskQuery().processInstanceId(pId).active().list();
+            if(!list2.isEmpty()){
+                processNew.setNowTaskInfo(list2.get(0).getName());
+            }
+        }
+
+        JSONObject object3 = JSONObject.parseObject(list.get(0).getMesg());
+        JSONArray arr2 = new JSONArray();
+        object3.put("taskBreak", arr2);
+        object3.put("itemList",jsonArray);
+        processNew.setMesg(object3.toJSONString());
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("TODO_ID",processNew.getId());
+        wrapper.eq("EXEC_TYPE",2);
+        wrapper.eq("EXEC_STATUS",0);
+        long count = oaTaskExecService.count(wrapper);
+        processNew.setCommitStatus(count);
+        return processNew;
+    }
+
     /**
      * 查询 taskIds项
      * @param prcId