From bc117884b52deecc814156cc698ba040b7966bc2 Mon Sep 17 00:00:00 2001
From: dingbingqing <dingbingqing@syxysoft.com>
Date: Thu, 29 Dec 2022 11:21:53 +0800
Subject: [PATCH] =?UTF-8?q?/decodeDetail=E6=8E=A5=E5=8F=A3=E4=B8=AD?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE=E5=8E=BB=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business_activiti/task/TodoTaskController.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 1387d5dd..2fdf2726 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
@@ -1799,6 +1799,7 @@ public class TodoTaskController extends BaseAction {
         Map<String,JSONObject> msgData =new HashMap<>();
         List<String> idData=new ArrayList<>();
         List<BusProcessNew> listData = iBusProcessNewService.list(q.eq("P_ID", pId));
+        //取出此任务中所有审核mesg数据
         for (BusProcessNew bpn:listData) {
             String mesg = bpn.getMesg();
             JSONObject object = JSONObject.parseObject(mesg);
@@ -1809,10 +1810,20 @@ public class TodoTaskController extends BaseAction {
                 msgData.put(bpn.getTaskId(),object);
             }
         }
+        //将所有mesg数据进行整合
         JSONArray jsonArray=new JSONArray();
         for (String id:idData) {
             jsonArray.addAll(msgData.get(id).getJSONArray("itemList"));
         }
+        //将mesg数据进行去重
+//        for (int i = 0; i < jsonArray.size()-1; i++) {
+//            for (int j = i+1; j < jsonArray.size(); j++) {
+//                if(jsonArray.get(i).equals(jsonArray.get(j))){
+//                    jsonArray.remove(j);
+//                }
+//            }
+//        }
+        //将mesg数据进行排序
         boolean f=false;
         for (int i = 0; i < jsonArray.size()-1; i++) {
             for (int j = 0; j < jsonArray.size()-1-i; j++) {
@@ -1827,6 +1838,7 @@ public class TodoTaskController extends BaseAction {
             }
             if(!f){break;}
         }
+        //后处理
         List<String> taskIdList = new ArrayList<>(Arrays.asList(taskIds.split(",")));
         List<BusProcessNew> list = iBusProcessNewService.findNoExecuteBusProcessNewForEnd(taskIdList);
         if (list.isEmpty()) {