reroute重新计算表单

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Reroute.java

@@ -61,10 +61,12 @@ class V2Reroute extends BaseAction {
 					emc.beginTransaction(Task.class);
 					emc.beginTransaction(WorkLog.class);
 					// work.setForceRoute(true);
-//					work.setSplitting(false);
-//					work.setSplitToken("");
-//					work.getSplitTokenList().clear();
-//					work.setSplitValue("");
+					// work.setSplitting(false);
+					// work.setSplitToken("");
+					// work.getSplitTokenList().clear();
+					// work.setSplitValue("");
+					/** 重新设置表单 */
+					setForm(work, activity);
 					work.setDestinationActivity(activity.getId());
 					work.setDestinationActivityType(activity.getActivityType());
 					work.setDestinationRoute("");
@@ -97,6 +99,12 @@ class V2Reroute extends BaseAction {
 
 	}
 
+	private void setForm(Work work, Activity activity) {
+		if (StringUtils.isNotEmpty(activity.getForm())) {
+			work.setForm(activity.getForm());
+		}
+	}
+
 	public static class Wi extends V2RerouteWi {
 
 	}

o2server/x_query_service_processing/src/main/java/com/x/query/service/processing/helper/ExtractTextHelper.java

@@ -2,13 +2,17 @@ package com.x.query.service.processing.helper;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.util.List;
 
 import javax.imageio.ImageIO;
 
+import com.x.base.core.project.config.Config;
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
+import com.x.base.core.project.tools.DefaultCharset;
+import com.x.base.core.project.tools.ListTools;
+
 import org.apache.commons.collections4.list.UnmodifiableList;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.pdfbox.cos.COSDocument;
 import org.apache.pdfbox.io.RandomAccessBuffer;
@@ -17,12 +21,6 @@ import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.tika.Tika;
 
-import com.x.base.core.project.config.Config;
-import com.x.base.core.project.logger.Logger;
-import com.x.base.core.project.logger.LoggerFactory;
-import com.x.base.core.project.tools.DefaultCharset;
-import com.x.base.core.project.tools.ListTools;
-
 import net.sourceforge.tess4j.Tesseract;
 
 public class ExtractTextHelper {
@@ -150,12 +148,4 @@ public class ExtractTextHelper {
 		return tika;
 	}
 
-//	@Test
-//	public void test1() throws Exception {
-//		System.out.println(ExtractTextHelper.extract(FileUtils.readFileToByteArray(new File("d:/2.doc")), "文件内容&文件内容.doc", true,
-//				true, true, false));
-//		System.out.println(ExtractTextHelper.extract(FileUtils.readFileToByteArray(new File("d:/2.doc")), "文件内容&文件内容.doc", true,
-//				true, true, false));
-//	}
-
 }