Merge branch 'feature/java11' into 'develop'

修改listForm

See merge request o2oa/o2oa!1522

o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/form/ActionListNext.java

@@ -12,17 +12,16 @@ import com.x.processplatform.core.entity.element.Form;
 
 class ActionListNext extends BaseAction {
 	ActionResult<List<Wo>> execute(String id, Integer count) throws Exception {
-		ActionResult<List<Wo>> result = new ActionResult<>();
-		result = this.standardListNext(Wo.copier, id, count,  JpaObject.sequence_FIELDNAME, null, null, null, null, null, null, null, null,
-				true, DESC);
-		return result;
+		return this.standardListNext(Wo.copier, id, count, JpaObject.sequence_FIELDNAME, null, null, null, null, null,
+				null, null, null, true, DESC);
 	}
 
 	public static class Wo extends Form {
 
 		private static final long serialVersionUID = -7495725325510376323L;
 
-		public static WrapCopier<Form, Wo> copier = WrapCopierFactory.wo(Form.class, Wo.class, null,
+		public static final WrapCopier<Form, Wo> copier = WrapCopierFactory.wo(Form.class, Wo.class,
+				JpaObject.singularAttributeField(Form.class, true, true),
 				ListTools.toList(JpaObject.FieldsInvisible, Form.data_FIELDNAME, Form.mobileData_FIELDNAME));
 
 		@FieldDescribe("排序号")

o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/form/ActionListPrev.java

@@ -8,22 +8,20 @@ import com.x.base.core.project.bean.WrapCopier;
 import com.x.base.core.project.bean.WrapCopierFactory;
 import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.tools.ListTools;
-import com.x.processplatform.assemble.designer.jaxrs.form.ActionListNext.Wo;
 import com.x.processplatform.core.entity.element.Form;
 
 class ActionListPrev extends BaseAction {
 	ActionResult<List<Wo>> execute(String id, Integer count) throws Exception {
-		ActionResult<List<Wo>> result = new ActionResult<>();
-		result = this.standardListPrev(Wo.copier, id, count,  JpaObject.sequence_FIELDNAME, null, null, null, null, null, null, null, null,
-				true, DESC);
-		return result;
+		return this.standardListPrev(Wo.copier, id, count, JpaObject.sequence_FIELDNAME, null, null, null, null, null,
+				null, null, null, true, DESC);
 	}
 
 	public static class Wo extends Form {
 
 		private static final long serialVersionUID = -7495725325510376323L;
 
-		public static WrapCopier<Form, Wo> copier = WrapCopierFactory.wo(Form.class, Wo.class, null,
+		public static final WrapCopier<Form, Wo> copier = WrapCopierFactory.wo(Form.class, Wo.class,
+				JpaObject.singularAttributeField(Form.class, true, true),
 				ListTools.toList(JpaObject.FieldsInvisible, Form.data_FIELDNAME, Form.mobileData_FIELDNAME));
 
 		@FieldDescribe("排序号")

o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/form/ActionListWithApplication.java

@@ -12,6 +12,7 @@ import com.x.base.core.project.http.ActionResult;
 import com.x.base.core.project.http.EffectivePerson;
 import com.x.base.core.project.tools.ListTools;
 import com.x.processplatform.assemble.designer.Business;
+import com.x.processplatform.assemble.designer.jaxrs.form.ActionListNext.Wo;
 import com.x.processplatform.core.entity.element.Application;
 import com.x.processplatform.core.entity.element.Form;
 
@@ -41,7 +42,8 @@ class ActionListWithApplication extends BaseAction {
 
 		private static final long serialVersionUID = -7495725325510376323L;
 
-		public static WrapCopier<Form, Wo> copier = WrapCopierFactory.wo(Form.class, Wo.class, null,
+		public static final WrapCopier<Form, Wo> copier = WrapCopierFactory.wo(Form.class, Wo.class,
+				JpaObject.singularAttributeField(Form.class, true, true),
 				ListTools.toList(JpaObject.FieldsInvisible, Form.data_FIELDNAME, Form.mobileData_FIELDNAME));
 
 	}