添加allowAddTask

o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Portal.java

@@ -23,6 +23,7 @@ public class Portal extends ConfigObject {
 	}
 
 	@FieldDescribe("url转换配置.")
+	@Deprecated(since = "7.2", forRemoval = true)
 	private LinkedHashMap<String, String> urlMapping;
 
 	@FieldDescribe("定制首页面设置.")

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/ActionGetWorkOrWorkCompleted.java

@@ -112,6 +112,9 @@ class ActionGetWorkOrWorkCompleted extends BaseAction {
 		// 是否可以重置处理人
 		wo.setAllowReset(PropertyTools.getOrElse(activity, Manual.allowReset_FIELDNAME, Boolean.class, false)
 				&& wo.getAllowSave());
+		// 是否可以加签
+		wo.setAllowAddTask(PropertyTools.getOrElse(activity, Manual.ALLOWADDTASK_FIELDNAME, Boolean.class, false)
+				&& wo.getAllowAddTask());
 		// 是否可以调度
 		wo.setAllowReroute(PropertyTools.getOrElse(activity, Activity.allowReroute_FIELDNAME, Boolean.class, false)
 				&& this.canManageApplicationOrProcess(business, effectivePerson, work.getApplication(),
@@ -170,7 +173,6 @@ class ActionGetWorkOrWorkCompleted extends BaseAction {
 				&& this.hasTaskCompletedWithJob(business, effectivePerson, work.getJob()));
 		// 是否可以看到
 		wo.setAllowVisit(true);
-
 		return wo;
 
 	}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/BaseAction.java

@@ -30,7 +30,8 @@ abstract class BaseAction extends StandardJaxrsAction {
 		private Boolean allowSave = false;
 		// 是否可以重置处理人
 		private Boolean allowReset = false;
-
+		// 是否可以加签
+		private Boolean allowAddTask = false;
 		// 是否可以调度
 		private Boolean allowReroute = false;
 		// 是否可以删除
@@ -152,6 +153,14 @@ abstract class BaseAction extends StandardJaxrsAction {
 			this.allowResume = allowResume;
 		}
 
+		public Boolean getAllowAddTask() {
+			return allowAddTask;
+		}
+
+		public void setAllowAddTask(Boolean allowAddTask) {
+			this.allowAddTask = allowAddTask;
+		}
+
 	}
 
 	protected CompletableFuture<Boolean> checkControlFuture(EffectivePerson effectivePerson, String flag) {

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Add.java

@@ -37,11 +37,11 @@ import com.x.processplatform.core.entity.content.Work;
 import com.x.processplatform.core.entity.content.WorkCompleted;
 import com.x.processplatform.core.entity.content.WorkLog;
 import com.x.processplatform.core.express.ProcessingAttributes;
-import com.x.processplatform.core.express.assemble.surface.jaxrs.work.V2AddManualTaskIdentityMatrixWi;
-import com.x.processplatform.core.express.assemble.surface.jaxrs.work.V2AddManualTaskIdentityMatrixWi.Option;
 import com.x.processplatform.core.express.service.processing.jaxrs.task.ProcessingWi;
 import com.x.processplatform.core.express.service.processing.jaxrs.task.WrapUpdatePrevTaskIdentity;
 import com.x.processplatform.core.express.service.processing.jaxrs.taskcompleted.WrapUpdateNextTaskIdentity;
+import com.x.processplatform.core.express.service.processing.jaxrs.work.V2AddManualTaskIdentityMatrixWi;
+import com.x.processplatform.core.express.service.processing.jaxrs.work.V2AddManualTaskIdentityMatrixWi.Option;
 
 public class V2Add extends BaseAction {
 

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Reset.java

@@ -38,9 +38,9 @@ import com.x.processplatform.core.entity.element.ActivityType;
 import com.x.processplatform.core.entity.element.Manual;
 import com.x.processplatform.core.entity.element.ManualMode;
 import com.x.processplatform.core.express.ProcessingAttributes;
-import com.x.processplatform.core.express.assemble.surface.jaxrs.work.V2AddManualTaskIdentityMatrixWi;
 import com.x.processplatform.core.express.service.processing.jaxrs.task.ProcessingWi;
 import com.x.processplatform.core.express.service.processing.jaxrs.task.V2ResetWi;
+import com.x.processplatform.core.express.service.processing.jaxrs.work.V2AddManualTaskIdentityMatrixWi;
 
 public class V2Reset extends BaseAction {
 

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2AddManualTaskIdentityMatrix.java

@@ -24,7 +24,7 @@ import com.x.processplatform.assemble.surface.ThisApplication;
 import com.x.processplatform.assemble.surface.WorkControl;
 import com.x.processplatform.core.entity.content.Work;
 import com.x.processplatform.core.express.ProcessingAttributes;
-import com.x.processplatform.core.express.assemble.surface.jaxrs.work.V2AddManualTaskIdentityMatrixWi;
+import com.x.processplatform.core.express.service.processing.jaxrs.work.V2AddManualTaskIdentityMatrixWi;
 
 class V2AddManualTaskIdentityMatrix extends BaseAction {
 

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java

@@ -73,6 +73,7 @@ public class Manual extends Activity {
 	public void postLoad() {
 		if (null != this.properties) {
 			this.customData = this.getProperties().getCustomData();
+			this.allowAddTask = this.getProperties().getAllowAddTask();
 		}
 	}
 
@@ -110,6 +111,24 @@ public class Manual extends Activity {
 		this.properties.setCustomData(customData);
 	}
 
+	public static final String ALLOWADDTASK_FIELDNAME = "allowAddTask";
+	@Transient
+	@FieldDescribe("是否允许加签")
+	private Boolean allowAddTask;
+
+	public Boolean getAllowAddTask() {
+		if (null != this.allowAddTask) {
+			return this.allowAddTask;
+		} else {
+			return this.getProperties().getAllowAddTask();
+		}
+	}
+
+	public void setAllowAddTask(Boolean allowAddTask) {
+		this.allowAddTask = allowAddTask;
+		this.properties.setAllowAddTask(allowAddTask);
+	}
+
 	public ManualTaskIdentityMatrix identitiesToManualTaskIdentityMatrix(List<String> identities) {
 		switch (this.getManualMode()) {
 		case parallel:

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/ManualProperties.java

@@ -10,6 +10,9 @@ public class ManualProperties extends JsonProperties {
 	@FieldDescribe("活动自定义数据")
 	private JsonElement customData;
 
+	@FieldDescribe("是否允许加签")
+	private Boolean allowAddTask;
+
 	public JsonElement getCustomData() {
 		return customData;
 	}
@@ -18,4 +21,12 @@ public class ManualProperties extends JsonProperties {
 		this.customData = customData;
 	}
 
+	public Boolean getAllowAddTask() {
+		return allowAddTask;
+	}
+
+	public void setAllowAddTask(Boolean allowAddTask) {
+		this.allowAddTask = allowAddTask;
+	}
+
 }

o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/assemble/surface/jaxrs/work/V2AddManualTaskIdentityMatrixWi.java → o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/service/processing/jaxrs/work/V2AddManualTaskIdentityMatrixWi.java

-package com.x.processplatform.core.express.assemble.surface.jaxrs.work;
+package com.x.processplatform.core.express.service.processing.jaxrs.work;
 
 import java.util.List;
 
@@ -46,7 +46,7 @@ public class V2AddManualTaskIdentityMatrixWi extends GsonPropertyObject {
 
 	public static class Option {
 
-		@FieldDescribe("位置,before,after,first,last,extend")
+		@FieldDescribe("位置,before,after,top,bottom,extend")
 		private String position;
 
 		@FieldDescribe("身份")

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

@@ -22,7 +22,7 @@ import com.x.base.core.project.logger.LoggerFactory;
 import com.x.base.core.project.processplatform.ManualTaskIdentityMatrix;
 import com.x.base.core.project.tools.ListTools;
 import com.x.processplatform.core.entity.content.Work;
-import com.x.processplatform.core.express.assemble.surface.jaxrs.work.V2AddManualTaskIdentityMatrixWi;
+import com.x.processplatform.core.express.service.processing.jaxrs.work.V2AddManualTaskIdentityMatrixWi;
 import com.x.processplatform.service.processing.Business;
 
 class V2AddManualTaskIdentityMatrix extends BaseAction {