Merge branch 'feature/index' into 'develop'

修复ctl ec 以及允许多选优先路由

See merge request o2oa/o2oa!1292

o2server/x_console/src/main/java/com/x/server/console/action/EraseContentLog.java

@@ -5,27 +5,27 @@ import com.x.base.core.project.logger.LoggerFactory;
 
 public class EraseContentLog extends EraseContent {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(EraseContentLog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EraseContentLog.class);
 
-	@Override
-	public boolean execute() {
-		try {
-			ClassLoader classLoader = EntityClassLoaderTools.concreteClassLoader();
-			Thread.currentThread().setContextClassLoader(classLoader);
-			this.init("log", null, classLoader);
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.FormVersion"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.ProcessVersion"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.ScriptVersion"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.log.SignalStackLog"));
-			addClass(classLoader.loadClass("com.x.program.center.core.entity.PromptErrorLog"));
-			addClass(classLoader.loadClass("com.x.program.center.core.entity.ScheduleLog"));
-			addClass(classLoader.loadClass("com.x.program.center.core.entity.UnexpectedErrorLog"));
-			addClass(classLoader.loadClass("com.x.program.center.core.entity.WarnLog"));
-			this.run();
-			return true;
-		} catch (Exception e) {
-			LOGGER.error(e);
-		}
-		return false;
-	}
+    @Override
+    public boolean execute() {
+        try {
+            ClassLoader classLoader = EntityClassLoaderTools.concreteClassLoader();
+            Thread.currentThread().setContextClassLoader(classLoader);
+            this.init("log", null, classLoader);
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.FormVersion"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.ProcessVersion"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.element.ScriptVersion"));
+//			addClass(classLoader.loadClass("com.x.processplatform.core.entity.log.SignalStackLog"));
+            addClass(classLoader.loadClass("com.x.program.center.core.entity.PromptErrorLog"));
+            addClass(classLoader.loadClass("com.x.program.center.core.entity.ScheduleLog"));
+            addClass(classLoader.loadClass("com.x.program.center.core.entity.UnexpectedErrorLog"));
+            addClass(classLoader.loadClass("com.x.program.center.core.entity.WarnLog"));
+            this.run();
+            return true;
+        } catch (Exception e) {
+            LOGGER.error(e);
+        }
+        return false;
+    }
 }
\ No newline at end of file

o2server/x_console/src/main/java/com/x/server/console/action/EraseContentProcessPlatform.java

@@ -6,33 +6,36 @@ import com.x.base.core.project.logger.LoggerFactory;
 
 public class EraseContentProcessPlatform extends EraseContent {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(EraseContentProcessPlatform.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(EraseContentProcessPlatform.class);
 
-	public boolean execute() {
-		try {
-			ClassLoader classLoader = EntityClassLoaderTools.concreteClassLoader();
-			Thread.currentThread().setContextClassLoader(classLoader);
-			this.init("processPlatform", ItemCategory.pp, classLoader);
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Attachment"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.DocumentVersion"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Draft"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Read"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.ReadCompleted"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Record"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Review"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.SerialNumber"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Task"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.TaskCompleted"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Work"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.WorkCompleted"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.WorkLog"));
-			addClass(classLoader.loadClass("com.x.processplatform.core.entity.log.SignalStackLog"));
-			addClass(classLoader.loadClass("com.x.query.core.entity.Item"));
-			this.run();
-			return true;
-		} catch (Exception e) {
-			LOGGER.error(e);
-		}
-		return false;
-	}
+    public boolean execute() {
+        try {
+            ClassLoader classLoader = EntityClassLoaderTools.concreteClassLoader();
+            Thread.currentThread().setContextClassLoader(classLoader);
+            this.init("processPlatform", ItemCategory.pp, classLoader);
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Attachment"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.DocSign"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.DocSignScrawl"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.DocumentVersion"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Draft"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.KeyLock"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Read"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.ReadCompleted"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Record"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Review"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.SerialNumber"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Snap"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Task"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.TaskCompleted"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.Work"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.WorkCompleted"));
+            addClass(classLoader.loadClass("com.x.processplatform.core.entity.content.WorkLog"));
+            addClass(classLoader.loadClass("com.x.query.core.entity.Item"));
+            this.run();
+            return true;
+        } catch (Exception e) {
+            LOGGER.error(e);
+        }
+        return false;
+    }
 }
\ No newline at end of file

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java

@@ -661,13 +661,21 @@ public class ManualProcessor extends AbstractManualProcessor {
         }
     }
 
+    /**
+     * 存在优先路由,如果有人选择了优先路由那么直接流转.需要判断是否启用了soleDirect,允许存在多个优先路由
+     * 
+     * @param aeiObjects
+     * @param taskCompleteds
+     * @return
+     * @throws Exception
+     */
     private boolean soleDirect(AeiObjects aeiObjects, List<TaskCompleted> taskCompleteds) throws Exception {
-        // 存在优先路由,如果有人选择了优先路由那么直接流转.需要判断是否启用了soleDirect
-        Optional<Route> route = aeiObjects.getRoutes().stream().filter(r -> BooleanUtils.isTrue(r.getSoleDirect()))
-                .findFirst();
-        if (route.isPresent()) {
+        final List<String> soleRouteNames = aeiObjects.getRoutes().stream()
+                .filter(r -> BooleanUtils.isTrue(r.getSoleDirect()))
+                .map(Route::getName).collect(Collectors.toList());
+        if (!soleRouteNames.isEmpty()) {
             Optional<TaskCompleted> taskCompleted = taskCompleteds.stream()
-                    .filter(t -> StringUtils.equals(t.getRouteName(), route.get().getName())).findFirst();
+                    .filter(t -> soleRouteNames.contains(t.getRouteName())).findFirst();
             if (taskCompleted.isPresent()) {
                 return true;
             }