准备编译发布4,3,2

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Record.java

@@ -77,6 +77,9 @@ public class Record extends SliceJpaObject {
 	/* 授权 */
 	public final static String TYPE_EMPOWER = "empower";
 
+	/* 超时自动流转 */
+	public final static String TYPE_PASSEXPIRED = "passExpired";
+
 	/* 定制意见 */
 	public final static String TYPE_CUSTOM = "custom";
 
@@ -101,12 +104,12 @@ public class Record extends SliceJpaObject {
 
 	public void onPersist() throws Exception {
 		switch (Objects.toString(this.type)) {
-		case TYPE_URGE:
-		case TYPE_EXPIRE:
-			this.display = false;
-			break;
-		default:
-			this.display = true;
+			case TYPE_URGE:
+			case TYPE_EXPIRE:
+				this.display = false;
+				break;
+			default:
+				this.display = true;
 		}
 	}
 	/* 更新运行方法 */
@@ -130,23 +133,23 @@ public class Record extends SliceJpaObject {
 		this.getProperties().setEmpowerFromIdentity(task.getEmpowerFromIdentity());
 	}
 
-//	public Record(Work work) {
-//		this();
-//		this.setApplication(work.getApplication());
-//		this.setProcess(work.getProcess());
-//		this.setWork(work.getId());
-//		this.setJob(work.getJob());
-//		this.setDisplay(true);
-//		this.setCompleted(false);
-//		this.setFromActivity(work.getActivity());
-//		this.setFromActivityType(work.getActivityType());
-//		this.setFromActivityName(work.getActivityName());
-//		this.setFromActivityAlias(work.getActivityAlias());
-//		this.setFromActivityToken(work.getActivityToken());
-////		this.getProperties().setOpinion("");
-////		this.getProperties().setRouteName(task.getRouteName());
-////		this.getProperties().setMediaOpinion(task.getMediaOpinion());
-//	}
+	// public Record(Work work) {
+	// this();
+	// this.setApplication(work.getApplication());
+	// this.setProcess(work.getProcess());
+	// this.setWork(work.getId());
+	// this.setJob(work.getJob());
+	// this.setDisplay(true);
+	// this.setCompleted(false);
+	// this.setFromActivity(work.getActivity());
+	// this.setFromActivityType(work.getActivityType());
+	// this.setFromActivityName(work.getActivityName());
+	// this.setFromActivityAlias(work.getActivityAlias());
+	// this.setFromActivityToken(work.getActivityToken());
+	//// this.getProperties().setOpinion("");
+	//// this.getProperties().setRouteName(task.getRouteName());
+	//// this.getProperties().setMediaOpinion(task.getMediaOpinion());
+	// }
 
 	public Record(WorkLog workLog) {
 		this();

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskCompleted.java

@@ -70,7 +70,7 @@ public class TaskCompleted extends SliceJpaObject implements ProjectionInterface
 	/* 智能流转 */
 	public static final String PROCESSINGTYPE_SAMETARGET = "sameTarget";
 	/* 超时流转 */
-	public static final String PROCESSINGTYPE_EXPIRE = "expire";
+	public static final String PROCESSINGTYPE_PASSEXPIRED = "passExpired";
 	/* 管理员流转 */
 	public static final String PROCESSINGTYPE_CONTROL = "control";
 	/* 添加处理人 */

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

@@ -52,7 +52,7 @@ import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 /**
- * 创建处于start状态的work
+ * 创建处于start状态的work 此方法不需要进入队列运行
  * 
  * @author Rui
  *
@@ -132,6 +132,7 @@ class ActionAssignCreate extends BaseAction {
 			Processing p = new Processing(processingAttributes);
 			p.processing(work.getId());
 		}
+ 
 		wo.setId(work.getId());
 		result.setData(wo);
 		return result;

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("工作")

package.json

@@ -12,12 +12,10 @@
                 "preperation:macos": "gulp preperation --e macos",
                 "preperation:neokylin": "gulp preperation --e neokylin",
                 "preperation:rpi": "gulp preperation --e raspberrypi",
-
                 "build_server": "gulp build_server",
                 "build_server_script": "cd o2server && mvn clean && mvn install",
                 "build_web": "gulp build_web",
                 "build_parallel": "npm run build_server && npm run build_web",
-
                 "deploy": "gulp deploy",
                 "deploy:win": "gulp deploy --e windows",
                 "deploy:linux": "gulp deploy --e linux",
@@ -26,10 +24,8 @@
                 "deploy:macos": "gulp deploy --e macos",
                 "deploy:neokylin": "gulp deploy --e neokylin",
                 "deploy:rpi": "gulp deploy --e raspberrypi",
-
                 "typeInfor": "type welcome && echo Your server is build success: target/o2server/",
                 "clear": "gulp clear_build",
-
                 "build": "npm run clear && npm run preperation && npm run build_parallel && npm run deploy && npm run typeInfor",
                 "build:win": "npm run clear && npm run preperation:win && npm run build_parallel && npm run deploy:win && npm run typeInfor",
                 "build:linux": "npm run clear && npm run preperation:linux && npm run build_parallel && npm run deploy:linux && npm run typeInfor",