Merge branch 'feature/processCategory' into 'develop'

添加process category

See merge request o2oa/o2oa!692

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

@@ -575,6 +575,11 @@ public class Process extends SliceJpaObject {
 	@Column(length = JpaObject.length_16B, name = ColumnNamePrefix + defaultStartMode_FIELDNAME)
 	private String defaultStartMode;
 
+	public static final String CATEGORY_FIELDNAME = "category";
+	@FieldDescribe("流程分类")
+	@Column(length = length_255B, name = ColumnNamePrefix + CATEGORY_FIELDNAME)
+	private String category;
+
 	@FieldDescribe("属性对象存储字段.")
 	@Persistent
 	@Strategy(JsonPropertiesValueHandler)
@@ -979,4 +984,12 @@ public class Process extends SliceJpaObject {
 	public void setStartableGroupList(List<String> startableGroupList) {
 		this.startableGroupList = startableGroupList;
 	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public void setCategory(String category) {
+		this.category = category;
+	}
 }

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

@@ -379,7 +379,7 @@ public class WorkAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 
-	@JaxrsMethodDescribe(value = "V2_添加待办身份矩阵.", action = V2AddManualTaskIdentityMatrix.class)
+	@JaxrsMethodDescribe(value = "V2_添加待办身份矩阵,before(在指定位置前添加),after(在指定位置后添加),top(添加在最前),bottom(添加到最后),extend(与指定位置同一行进行扩展)", action = V2AddManualTaskIdentityMatrix.class)
 	@POST
 	@Path("v2/{id}/add/manual/task/identity/matrix")
 	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)