Merge branch 'master' of https://git.o2oa.net/o2oa/o2oa

.gitignore

@@ -8,7 +8,7 @@
 /o2server/servers/
 /o2server/store/jars/*.jar
 /o2server/store/*.war
-/o2server/*/config/
+/o2server/config/
 /o2server/store/
 /o2server/commons/
 /o2server/jvm/

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java

@@ -216,10 +216,10 @@ public class ActionPersistPublishContent extends BaseAction {
 			try {
 				JsonElement docData = XGsonBuilder.instance().toJsonTree(wi.getDocData(), Map.class);
 				wi.setDocStatus("published");
-				if( wi.getPublishTime() == null ) {
-					wi.setPublishTime(new Date());
-				}
-				document = documentPersistService.save(wi.copier.copy(wi), docData );
+				if( wi.getPublishTime() == null ) { wi.setPublishTime(new Date()); }
+				document =  wi.copier.copy(wi);
+				document.setId( wi.getId() );
+				document = documentPersistService.save( document, docData );
 			} catch (Exception e) {
 				check = false;
 				Exception exception = new ExceptionDocumentInfoProcess(e, "系统在创建文档信息时发生异常！");
@@ -365,10 +365,10 @@ public class ActionPersistPublishContent extends BaseAction {
 
 	public static class Wi {
 		
-		public static List<String> Excludes = new ArrayList<String>(JpaObject.FieldsUnmodify);
-		
 		public static WrapCopier<Wi, Document> copier = WrapCopierFactory.wi( Wi.class, Document.class, null, null);
 
+		private String id = null;
+
 		@FieldDescribe( "文档操作者身份." )
 		private String identity = null;
 		
@@ -491,9 +491,23 @@ public class ActionPersistPublishContent extends BaseAction {
 		private List<String> managerList;
 
 		private List<String> pictureList;
-		
-		
-		
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public Boolean getTop() {
+			return isTop;
+		}
+
+		public void setTop(Boolean top) {
+			isTop = top;
+		}
+
 		public String getSummary() {
 			return summary;
 		}

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

@@ -55,6 +55,7 @@ import org.apache.commons.lang3.StringUtils;
  * 
  * @author Rui
  *
+ * 此方法不需要推入线程池运行
  */
 class ActionAssignCreate extends BaseAction {
 
@@ -66,7 +67,9 @@ class ActionAssignCreate extends BaseAction {
 		Wo wo = new Wo();
 		Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
 		Boolean processing = wi.getProcessing();
+
 		Work work = null;
+
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 			Business business = new Business(emc);
 			List<String> applicationIds = listApplication(business, wi.getApplication());
@@ -125,7 +128,7 @@ class ActionAssignCreate extends BaseAction {
 			ThisApplication.context().applications().putQuery(x_processplatform_service_processing.class,
 					Applications.joinQueryUri("work", work.getId(), "processing"), null, work.getJob());
 		}
-
+ 
 		wo.setId(work.getId());
 		result.setData(wo);
 		return result;

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

@@ -1,13 +1,11 @@
 package com.x.processplatform.service.processing.jaxrs.work;
 
 import java.util.Date;
-import java.util.concurrent.Callable;
 
 import com.google.gson.JsonElement;
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
 import com.x.base.core.entity.annotation.CheckPersistType;
-import com.x.base.core.project.executor.ProcessPlatformExecutorFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.jaxrs.WoId;
@@ -26,7 +24,8 @@ import com.x.processplatform.service.processing.WorkDataHelper;
  * 创建处于start状态的work
  * 
  * @author Rui
- *
+ * 
+ * 此方法不需要推入线程池运行
  */
 class ActionCreate extends BaseAction {
 

o2web/source/x_component_process_TaskCenter/Main.js

@@ -1177,7 +1177,7 @@ MWF.xApplication.process.TaskCenter.Starter = new Class({
                         if (pro.name.indexOf(key)!==-1){
                             var data = Object.clone(pro);
                             data.applicationName = app.name;
-                            new MWF.xApplication.process.TaskCenter.Process(data, {"app": this}, {"name": app}, proListNode);
+                            new MWF.xApplication.process.TaskCenter.Process(data, {"app": this.app, "starter": this}, {"name": app}, proListNode);
                         }
                     }.bind(this));
                 }.bind(this));