Merge branch 'hotfix/pom' into 'develop'

Hotfix/pom

See merge request o2oa/o2oa!119

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_jpush_assemble_control/pom.xml

@@ -121,7 +121,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>../../o2server/custom</outputDirectory>
+							<outputDirectory>../store</outputDirectory>
 							<resources>
 								<resource>
 									<directory>target</directory>

o2server/x_jpush_core_entity/pom.xml

@@ -83,7 +83,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>../../o2server/custom/jars</outputDirectory>
+							<outputDirectory>../store/jars</outputDirectory>
 							<resources>
 								<resource>
 									<directory>target</directory>

o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/ProcessingAttributes.java

@@ -16,6 +16,7 @@ public class ProcessingAttributes extends GsonPropertyObject {
 	public static final String TYPE_RESET = "reset";
 	public static final String TYPE_RETRACT = "retract";
 	public static final String TYPE_ROLLBACK = "rollback";
+	//public static final String TYPE_BEGIN = "begin";
 	private Integer loop = 1;
 
 	@FieldDescribe("强制从arrive开始")

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

@@ -41,6 +41,7 @@ import com.x.processplatform.core.entity.element.Application_;
 import com.x.processplatform.core.entity.element.Begin;
 import com.x.processplatform.core.entity.element.Process;
 import com.x.processplatform.core.entity.element.Process_;
+import com.x.processplatform.core.express.ProcessingAttributes;
 import com.x.processplatform.service.processing.Business;
 import com.x.processplatform.service.processing.MessageFactory;
 import com.x.processplatform.service.processing.ThisApplication;
@@ -50,7 +51,7 @@ import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 /**
- * 创建处于start状态的work
+ * 创建处于start状态的work 此方法不需要进入队列运行
  * 
  * @author Rui
  *
@@ -122,9 +123,12 @@ class ActionAssignCreate extends BaseAction {
 		}
 		MessageFactory.work_create(work);
 		if (BooleanUtils.isTrue(processing)) {
+			// ProcessingAttributes req = new ProcessingAttributes();
+			// req.setType(ProcessingAttributes.TYPE_BEGIN);
 			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

@@ -40,7 +40,6 @@ class ActionCreate extends BaseAction {
 			Process process = business.element().get(processId, Process.class);
 			Application application = business.element().get(process.getApplication(), Application.class);
 			Begin begin = business.element().getBeginWithProcess(process.getId());
-
 			work = create(application, process, begin);
 			emc.beginTransaction(Work.class);
 			if ((null != jsonElement) && jsonElement.isJsonObject()) {

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

@@ -27,7 +27,6 @@ import com.x.base.core.project.jaxrs.ResponseFactory;
 import com.x.base.core.project.jaxrs.StandardJaxrsAction;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
-import com.x.processplatform.core.entity.element.ActivityType;
 
 @Path("work")
 @JaxrsDescribe("工作")