From a2083fa80cfdc05bc739b5a448417f185b0d577e Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Sun, 5 Dec 2021 20:56:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../confirmAfter.java                         | 53 ++++++++++++-------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java
index f3943a9d..71d9bc47 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmAfter.java
@@ -65,14 +65,23 @@ public class confirmAfter implements TaskListener {
                 });
             }
             //草拟吗
-            map.keySet().forEach(s -> {
-               res.add(map.get(s));
-            });
             successmap.keySet().forEach(s -> {
-                if (!standIds.contains(s)){
-                    res.add(successmap.get(s));
+                res.add(successmap.get(s));
+            });
+            map.keySet().forEach(s -> {
+                if (successIds.contains(s)) {
+                    JSONObject jsonObject=successmap.get(s);
+                    jsonObject.put("involve","involve");
+                    jsonObject.put("remarks",map.get(s).getString("remarks"));
+                }else {
+                    res.add(map.get(s));
                 }
             });
+//            successmap.keySet().forEach(s -> {
+//                if (!standIds.contains(s)){
+//                    res.add(successmap.get(s));
+//                }
+//            });
             object.put("dataList",res);
         }
         nextUserList.add(delegateTask.getVariable("cpManager",String.class));
@@ -113,25 +122,31 @@ public class confirmAfter implements TaskListener {
     }
 
     private void makeData(Map<String, JSONObject> map, Map<String, JSONObject> successmap, List<String> standIds, List<String> successIds, JSONObject object1, JSONObject object11) {
-        if (!standIds.contains(object11.getString("standId"))){
+//        if (!standIds.contains(object11.getString("standId"))){
             if ("noInvolve".equals(object11.getString("involve"))){
-                object11.put("remarks",object1.getString("currentPerson")+":"+object11.getString("remarks"));
-                standIds.add(object11.getString("standId"));
-                map.put(object11.getString("standId"),object11);
+                if (!standIds.contains(object11.getString("standId"))) {
+                    object11.put("remarks", object1.getString("currentPerson") + ":" + object11.getString("remarks"));
+                    standIds.add(object11.getString("standId"));
+                    map.put(object11.getString("standId"), object11);
+                }else {
+                    standIds.add(object11.getString("standId"));
+                    map.get(object11.getString("standId")).put("remarks",map.get(object11.getString("standId")).getString("remarks")+","+object1.getString("currentPerson")+":"+object11.getString("remarks"));
+                }
             }else {
                 if (!successIds.contains(object11.getString("standId"))) {
                     successmap.put(object11.getString("standId"),object11);
+                    successIds.add(object11.getString("standId"));
                 }
             }
-        }else {
-            if ("noInvolve".equals(object11.getString("involve"))){
-                standIds.add(object11.getString("standId"));
-                map.get(object11.getString("standId")).put("remarks",map.get(object11.getString("standId")).getString("remarks")+","+object1.getString("currentPerson")+":"+object11.getString("remarks"));
-            }else {
-                if (!successIds.contains(object11.getString("standId"))) {
-                    successmap.put(object11.getString("standId"),object11);
-                }
-            }
-        }
+//        }else {
+//            if ("noInvolve".equals(object11.getString("involve"))){
+//                standIds.add(object11.getString("standId"));
+//                map.get(object11.getString("standId")).put("remarks",map.get(object11.getString("standId")).getString("remarks")+","+object1.getString("currentPerson")+":"+object11.getString("remarks"));
+//            }else {
+//                if (!successIds.contains(object11.getString("standId"))) {
+//                    successmap.put(object11.getString("standId"),object11);
+//                }
+//            }
+//        }
     }
 }