合并分支 'dev_20230216' 到 'master'

复审流程查询代码 优化

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

src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java

@@ -210,6 +210,7 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
                 objectQueryWrapper.like("PRC_NAME",str);
                 List<BusProcessNew> busProcessNews = baseMapper.selectList(objectQueryWrapper);
                 if(!busProcessNews.isEmpty()){
+                    Integer count = 0;
                     for (BusProcessNew busProcessNew : busProcessNews){
                         if(busProcessNew.getPrcName().contains("企标复审")){
                             JSONObject jsonObject = JSON.parseObject(busProcessNew.getMesg());
@@ -219,14 +220,19 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
                                     if (data.getStandId().equals(standId)) {
                                         //如果相等 则判断task表示否有待办任务
                                         List<Task> list = taskService.createTaskQuery().taskId(busProcessNew.getTaskId()).list();
-                                        if (list.isEmpty()) {
+                                        if (!list.isEmpty()) {
+                                            count = count+1;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if(count>0){
+                        continue;
+                    }else {
                         objects.add(data);
                     }
-                                    }
-                                }
-                            }
-                        }
-                    }
                 }else {
                     objects.add(data);
                 }
@@ -239,4 +245,8 @@ public class BusProcessNewServiceImpl extends ServiceImpl<BusProcessNewMapper, B
         }
         return row;
     }
+
+    public void taskInfo(List<BusProcessNew> busProcessNews){
+
+    }
 }