合并分支 'dev_foton_DBQ' 到 'FOTON'

/decodeDetail接口中进行数据去重4

查看合并请求 laws-foton-slrs/foton-wkflow-rest!9

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

@@ -1796,24 +1796,21 @@ public class TodoTaskController extends BaseAction {
     @GetMapping("/decodeDetail")
     public BusProcessNew Detail(String taskIds, String pId) {
         QueryWrapper<BusProcessNew> q=new QueryWrapper<>();
-        Map<String,JSONObject> msgData =new HashMap<>();
+        Set<JSONObject> msgData =new HashSet<>();
-        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);
             String resolveFlag = object.getString("resolveFlag");
-
             if(bpn.getTaskInfo().equals("审核")&&resolveFlag.equals("1")){
-                idData.add(bpn.getTaskId());
+                msgData.add(object);
-                msgData.put(bpn.getTaskId(),object);
             }
         }
         //将所有mesg数据进行整合
         JSONArray jsonArray=new JSONArray();
-        for (String id:idData) {
+        for (JSONObject jo:msgData) {
-            jsonArray.addAll(msgData.get(id).getJSONArray("itemList"));
+            jsonArray.addAll(jo.getJSONArray("itemList"));
         }
         //将mesg数据进行去重
 //        for (int i = 0; i < jsonArray.size()-1; i++) { //双循环法
@@ -1823,9 +1820,9 @@ public class TodoTaskController extends BaseAction {
 //                }
 //            }
 //        }
-        Set set = new HashSet();//hashset法
+        Set<JSONObject> set = new HashSet<>();//hashset法
         for(int i = 0 ; i<jsonArray.size();i++){
-            set.add(jsonArray.get(i));
+            set.add(jsonArray.getJSONObject(i));
         }
         jsonArray = JSONArray.parseArray(set.toString());
         //将mesg数据进行排序