Merge branch 'fix/增加待办已办title搜索' into 'develop'

【流程平台】增加已办title搜索

See merge request o2oa/o2oa!1387

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

@@ -103,6 +103,9 @@ abstract class V2Base extends StandardJaxrsAction {
 		@FieldDescribe("关键字")
 		private String key;
 
+		@FieldDescribe("标题")
+		private String title;
+
 		public Boolean getNotCompleted() {
 			return notCompleted;
 		}
@@ -206,6 +209,14 @@ abstract class V2Base extends StandardJaxrsAction {
 		public void setLatest(Boolean latest) {
 			this.latest = latest;
 		}
+
+		public String getTitle() {
+			return title;
+		}
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
 	}
 
 	public static abstract class RelateFilterWi extends FilterWi {
@@ -465,6 +476,12 @@ abstract class V2Base extends StandardJaxrsAction {
 							cb.like(root.get(TaskCompleted_.creatorPerson), key),
 							cb.like(root.get(TaskCompleted_.creatorUnit), key)));
 		}
+		if (StringUtils.isNotEmpty(wi.getTitle())) {
+			String title = StringTools.escapeSqlLikeKey(wi.getTitle());
+			if (StringUtils.isNotEmpty(title)) {
+				p = cb.and(cb.like(root.get(TaskCompleted_.title), "%" + title + "%"));
+			}
+		}
 		return p;
 	}