Merge branch 'feature/manageListFilterPaging_addFilter' into 'develop'

【流程维护】增加处理人搜索，业务数据映射搜索。

See merge request o2oa/o2oa!518

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/read/ActionManageListFilterPaging.java

@@ -61,6 +61,39 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(Read_.application).in(wi.getApplicationList()));
 		}
+		if (StringUtils.isNotBlank(wi.getPerson())){
+			p = cb.and(p,cb.equal(root.get(Read_.person), wi.person));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue01));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue02), wi.stringValue02));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue03), wi.stringValue03));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue04), wi.stringValue04));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue05), wi.stringValue05));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue06));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue07));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue08));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue09));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue10));
+		}
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(Read_.process).in(wi.getProcessList()));
 		}
@@ -115,6 +148,39 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(Read_.application).in(wi.getApplicationList()));
 		}
+		if (StringUtils.isNotBlank(wi.getPerson())){
+			p = cb.and(p,cb.equal(root.get(Read_.person), wi.person));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue01));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue02), wi.stringValue02));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue03), wi.stringValue03));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue04), wi.stringValue04));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue05), wi.stringValue05));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue06));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue07));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue08));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue09));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(Read_.stringValue01), wi.stringValue10));
+		}
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(Read_.process).in(wi.getProcessList()));
 		}
@@ -192,10 +258,45 @@ class ActionManageListFilterPaging extends BaseAction {
 		@FieldDescribe("匹配关键字")
 		private String key;
 
+		@FieldDescribe("当前待办人")
+		private String person;
+		@FieldDescribe("业务数据String值01")
+		private String stringValue01;
+		@FieldDescribe("业务数据String值02")
+		private String stringValue02;
+		@FieldDescribe("业务数据String值03")
+		private String stringValue03;
+		@FieldDescribe("业务数据String值04")
+		private String stringValue04;
+		@FieldDescribe("业务数据String值05")
+		private String stringValue05;
+		@FieldDescribe("业务数据String值06")
+		private String stringValue06;
+		@FieldDescribe("业务数据String值07")
+		private String stringValue07;
+		@FieldDescribe("业务数据String值08")
+		private String stringValue08;
+		@FieldDescribe("业务数据String值09")
+		private String stringValue09;
+		@FieldDescribe("业务数据String值10")
+		private String stringValue10;
+
 		public List<String> getApplicationList() {
 			return applicationList;
 		}
 
+		public String getPerson() { return person; }
+		public String getStringValue01() { return stringValue01; }
+		public String getStringValue02() { return stringValue02; }
+		public String getStringValue03() { return stringValue03; }
+		public String getStringValue04() { return stringValue04; }
+		public String getStringValue05() { return stringValue05; }
+		public String getStringValue06() { return stringValue06; }
+		public String getStringValue07() { return stringValue07; }
+		public String getStringValue08() { return stringValue08; }
+		public String getStringValue09() { return stringValue09; }
+		public String getStringValue10() { return stringValue10; }
+
 		public void setApplicationList(List<String> applicationList) {
 			this.applicationList = applicationList;
 		}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/readcompleted/ActionManageListFilterPaging.java

@@ -63,6 +63,41 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(ReadCompleted_.application).in(wi.getApplicationList()));
 		}
+
+		if (StringUtils.isNotBlank(wi.getPerson())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.person), wi.person));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue01));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue02), wi.stringValue02));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue03), wi.stringValue03));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue04), wi.stringValue04));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue05), wi.stringValue05));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue06));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue07));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue08));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue09));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue10));
+		}
+
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(ReadCompleted_.process).in(wi.getProcessList()));
 		}
@@ -117,6 +152,41 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(ReadCompleted_.application).in(wi.getApplicationList()));
 		}
+
+		if (StringUtils.isNotBlank(wi.getPerson())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.person), wi.person));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue01));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue02), wi.stringValue02));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue03), wi.stringValue03));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue04), wi.stringValue04));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue05), wi.stringValue05));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue06));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue07));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue08));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue09));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(ReadCompleted_.stringValue01), wi.stringValue10));
+		}
+
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(ReadCompleted_.process).in(wi.getProcessList()));
 		}
@@ -194,10 +264,45 @@ class ActionManageListFilterPaging extends BaseAction {
 		@FieldDescribe("匹配关键字")
 		private String key;
 
+		@FieldDescribe("当前待办人")
+		private String person;
+		@FieldDescribe("业务数据String值01")
+		private String stringValue01;
+		@FieldDescribe("业务数据String值02")
+		private String stringValue02;
+		@FieldDescribe("业务数据String值03")
+		private String stringValue03;
+		@FieldDescribe("业务数据String值04")
+		private String stringValue04;
+		@FieldDescribe("业务数据String值05")
+		private String stringValue05;
+		@FieldDescribe("业务数据String值06")
+		private String stringValue06;
+		@FieldDescribe("业务数据String值07")
+		private String stringValue07;
+		@FieldDescribe("业务数据String值08")
+		private String stringValue08;
+		@FieldDescribe("业务数据String值09")
+		private String stringValue09;
+		@FieldDescribe("业务数据String值10")
+		private String stringValue10;
+
 		public List<String> getApplicationList() {
 			return applicationList;
 		}
 
+		public String getPerson() { return person; }
+		public String getStringValue01() { return stringValue01; }
+		public String getStringValue02() { return stringValue02; }
+		public String getStringValue03() { return stringValue03; }
+		public String getStringValue04() { return stringValue04; }
+		public String getStringValue05() { return stringValue05; }
+		public String getStringValue06() { return stringValue06; }
+		public String getStringValue07() { return stringValue07; }
+		public String getStringValue08() { return stringValue08; }
+		public String getStringValue09() { return stringValue09; }
+		public String getStringValue10() { return stringValue10; }
+
 		public void setApplicationList(List<String> applicationList) {
 			this.applicationList = applicationList;
 		}

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

@@ -53,7 +53,7 @@ class ActionManageListFilterPaging extends BaseAction {
 	}
 
 	private List<Task> list(EffectivePerson effectivePerson, Business business, Integer adjustPage,
-			Integer adjustPageSize, Wi wi) throws Exception {
+							Integer adjustPageSize, Wi wi) throws Exception {
 		EntityManager em = business.entityManagerContainer().get(Task.class);
 		List<String> person_ids = business.organization().person().list(wi.getCredentialList());
 		CriteriaBuilder cb = em.getCriteriaBuilder();
@@ -63,6 +63,40 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(Task_.application).in(wi.getApplicationList()));
 		}
+		if (StringUtils.isNotBlank(wi.getPerson())){
+			p = cb.and(p,cb.equal(root.get(Task_.person), wi.person));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue01));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue02), wi.stringValue02));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue03), wi.stringValue03));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue04), wi.stringValue04));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue05), wi.stringValue05));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue06));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue07));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue08));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue09));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue10));
+		}
+
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(Task_.process).in(wi.getProcessList()));
 		}
@@ -125,6 +159,40 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(Task_.application).in(wi.getApplicationList()));
 		}
+		if (StringUtils.isNotBlank(wi.getPerson())){
+			p = cb.and(p,cb.equal(root.get(Task_.person), wi.person));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue01));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue02), wi.stringValue02));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue03), wi.stringValue03));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue04), wi.stringValue04));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue05), wi.stringValue05));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue06));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue07));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue08));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue09));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(Task_.stringValue01), wi.stringValue10));
+		}
+
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(Task_.process).in(wi.getProcessList()));
 		}
@@ -216,10 +284,47 @@ class ActionManageListFilterPaging extends BaseAction {
 		@FieldDescribe("匹配关键字")
 		private String key;
 
+
+		@FieldDescribe("当前待办人")
+		private String person;
+		@FieldDescribe("业务数据String值01")
+		private String stringValue01;
+		@FieldDescribe("业务数据String值02")
+		private String stringValue02;
+		@FieldDescribe("业务数据String值03")
+		private String stringValue03;
+		@FieldDescribe("业务数据String值04")
+		private String stringValue04;
+		@FieldDescribe("业务数据String值05")
+		private String stringValue05;
+		@FieldDescribe("业务数据String值06")
+		private String stringValue06;
+		@FieldDescribe("业务数据String值07")
+		private String stringValue07;
+		@FieldDescribe("业务数据String值08")
+		private String stringValue08;
+		@FieldDescribe("业务数据String值09")
+		private String stringValue09;
+		@FieldDescribe("业务数据String值10")
+		private String stringValue10;
+
 		public List<String> getApplicationList() {
 			return applicationList;
 		}
 
+		public String getPerson() { return person; }
+		public String getStringValue01() { return stringValue01; }
+		public String getStringValue02() { return stringValue02; }
+		public String getStringValue03() { return stringValue03; }
+		public String getStringValue04() { return stringValue04; }
+		public String getStringValue05() { return stringValue05; }
+		public String getStringValue06() { return stringValue06; }
+		public String getStringValue07() { return stringValue07; }
+		public String getStringValue08() { return stringValue08; }
+		public String getStringValue09() { return stringValue09; }
+		public String getStringValue10() { return stringValue10; }
+
+
 		public void setApplicationList(List<String> applicationList) {
 			this.applicationList = applicationList;
 		}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/taskcompleted/ActionManageListFilterPaging.java

@@ -62,6 +62,39 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(TaskCompleted_.application).in(wi.getApplicationList()));
 		}
+		if (StringUtils.isNotBlank(wi.getPerson())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.person), wi.person));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue01));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue02), wi.stringValue02));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue03), wi.stringValue03));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue04), wi.stringValue04));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue05), wi.stringValue05));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue06));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue07));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue08));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue09));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue10));
+		}
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(TaskCompleted_.process).in(wi.getProcessList()));
 		}
@@ -108,6 +141,39 @@ class ActionManageListFilterPaging extends BaseAction {
 		if (ListTools.isNotEmpty(wi.getApplicationList())) {
 			p = cb.and(p, root.get(TaskCompleted_.application).in(wi.getApplicationList()));
 		}
+		if (StringUtils.isNotBlank(wi.getPerson())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.person), wi.person));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue01));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue02())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue02), wi.stringValue02));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue03())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue03), wi.stringValue03));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue04())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue04), wi.stringValue04));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue01())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue05), wi.stringValue05));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue06())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue06));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue07())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue07));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue08())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue08));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue09())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue09));
+		}
+		if (StringUtils.isNotBlank(wi.getStringValue10())){
+			p = cb.and(p,cb.equal(root.get(TaskCompleted_.stringValue01), wi.stringValue10));
+		}
 		if (ListTools.isNotEmpty(wi.getProcessList())) {
 			p = cb.and(p, root.get(TaskCompleted_.process).in(wi.getProcessList()));
 		}
@@ -177,10 +243,46 @@ class ActionManageListFilterPaging extends BaseAction {
 		@FieldDescribe("匹配关键字")
 		private String key;
 
+		@FieldDescribe("当前待办人")
+		private String person;
+		@FieldDescribe("业务数据String值01")
+		private String stringValue01;
+		@FieldDescribe("业务数据String值02")
+		private String stringValue02;
+		@FieldDescribe("业务数据String值03")
+		private String stringValue03;
+		@FieldDescribe("业务数据String值04")
+		private String stringValue04;
+		@FieldDescribe("业务数据String值05")
+		private String stringValue05;
+		@FieldDescribe("业务数据String值06")
+		private String stringValue06;
+		@FieldDescribe("业务数据String值07")
+		private String stringValue07;
+		@FieldDescribe("业务数据String值08")
+		private String stringValue08;
+		@FieldDescribe("业务数据String值09")
+		private String stringValue09;
+		@FieldDescribe("业务数据String值10")
+		private String stringValue10;
+
 		public List<String> getApplicationList() {
 			return applicationList;
 		}
 
+
+		public String getPerson() { return person; }
+		public String getStringValue01() { return stringValue01; }
+		public String getStringValue02() { return stringValue02; }
+		public String getStringValue03() { return stringValue03; }
+		public String getStringValue04() { return stringValue04; }
+		public String getStringValue05() { return stringValue05; }
+		public String getStringValue06() { return stringValue06; }
+		public String getStringValue07() { return stringValue07; }
+		public String getStringValue08() { return stringValue08; }
+		public String getStringValue09() { return stringValue09; }
+		public String getStringValue10() { return stringValue10; }
+
 		public void setApplicationList(List<String> applicationList) {
 			this.applicationList = applicationList;
 		}