添加listPaging搜索

(cherry picked from commit ae83b56646c2198683ee713e97bb81f0805a78ec)

o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/jaxrs/meeting/ActionPaging.java

@@ -79,6 +79,12 @@ class ActionPaging extends BaseAction {
 
 			p = filterManualCompleted(cb, root, p, wi.getManualCompleted());
 
+			p = filterHostUnit(cb, root, p, wi.getHostUnit());
+
+			p = filterHostPerson(cb, root, p, wi.getHostPerson());
+
+			p = filterType(cb, root, p, wi.getType());
+
 			Order order;
 			String sortField = wi.getSortField();
 			String sortType = wi.getSortType();
@@ -123,8 +129,6 @@ class ActionPaging extends BaseAction {
 		}
 	}
 
- 
-
 	public static class Wo extends WrapOutMeeting {
 		private static final long serialVersionUID = 4609263020989488356L;
 		static final WrapCopier<Meeting, Wo> copier = WrapCopierFactory.wo(Meeting.class, Wo.class, null,
@@ -175,7 +179,7 @@ class ActionPaging extends BaseAction {
 		@FieldDescribe("承办部门")
 		private String hostUnit;
 
-		@FieldDescribe("承办人")
+		@FieldDescribe("主持人")
 		private String hostPerson;
 
 		@FieldDescribe("类型")

o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/jaxrs/meeting/ActionPagingManage.java

@@ -105,6 +105,12 @@ class ActionPagingManage extends BaseAction {
 
 			p = filterManualCompleted(cb, root, p, wi.getManualCompleted());
 
+			p = filterHostUnit(cb, root, p, wi.getHostUnit());
+
+			p = filterHostPerson(cb, root, p, wi.getHostPerson());
+
+			p = filterType(cb, root, p, wi.getType());
+
 			Order order;
 			String sortField = wi.getSortField();
 			String sortType = wi.getSortType();
@@ -128,7 +134,7 @@ class ActionPagingManage extends BaseAction {
 			typedQuery.setFirstResult(pageIndex);
 			typedQuery.setMaxResults(pageSize);
 			ids = typedQuery.getResultList();
-			LOGGER.info("pagingtypedQuery {}." , typedQuery::toString);
+			LOGGER.info("pagingtypedQuery {}.", typedQuery::toString);
 
 			TypedQuery<String> tqCount = em.createQuery(cq.select(root.get(Meeting_.id)).where(p).distinct(true));
 			List<String> allid = tqCount.getResultList();
@@ -198,11 +204,11 @@ class ActionPagingManage extends BaseAction {
 
 		@FieldDescribe("排序.(desc|asc)")
 		private String sortType;
-		
+
 		@FieldDescribe("承办部门")
 		private String hostUnit;
 
-		@FieldDescribe("承办人")
+		@FieldDescribe("主持人")
 		private String hostPerson;
 
 		@FieldDescribe("类型")

o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/jaxrs/meeting/BaseAction.java

@@ -202,4 +202,25 @@ abstract class BaseAction extends StandardJaxrsAction {
 		return p;
 	}
 
+	protected Predicate filterHostUnit(CriteriaBuilder cb, Root<Meeting> root, Predicate p, String hostUnit) {
+		if (!StringUtils.isBlank(hostUnit)) {
+			p = cb.and(p, cb.like(root.get(Meeting_.hostUnit), "%" + hostUnit + "%"));
+		}
+		return p;
+	}
+
+	protected Predicate filterHostPerson(CriteriaBuilder cb, Root<Meeting> root, Predicate p, String hostPerson) {
+		if (!StringUtils.isBlank(hostPerson)) {
+			p = cb.and(p, cb.like(root.get(Meeting_.hostPerson), "%" + hostPerson + "%"));
+		}
+		return p;
+	}
+
+	protected Predicate filterType(CriteriaBuilder cb, Root<Meeting> root, Predicate p, String type) {
+		if (!StringUtils.isBlank(type)) {
+			p = cb.and(p, cb.like(root.get(Meeting_.type), "%" + type + "%"));
+		}
+		return p;
+	}
+
 }