分页重新编写

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -154,10 +154,8 @@ public class PublicInquiryController {
      * @return
      */
     @RequestMapping(method = RequestMethod.GET)
-    public Page<PurcInquiryItemInfo> getInquiry(String pageInfo, String searchFilter) {
-        PageInfo info = JSONObject.parseObject(pageInfo, PageInfo.class);
-        SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
-        return publicInquiryService.findTodoByPageInfo(info, filter);
+    public Page<PurcInquiryItemInfo> getInquiry(PageInfo pageInfo, SearchFilter searchFilter) {
+        return publicInquiryService.findTodoByPageInfo(pageInfo, searchFilter);
     }
 
     /**
@@ -225,18 +223,17 @@ public class PublicInquiryController {
      * @return
      */
     @RequestMapping(value = "/quotation/list", method = RequestMethod.GET)
-    public Page<PublicInquiryItemInfo> getQuotation(String pageInfo, String filter, String _state) {
-        PageInfo info = JSONObject.parseObject(pageInfo, PageInfo.class);
+    public Page<PublicInquiryItemInfo> getQuotation(PageInfo pageInfo, String filter, String _state) {
         SearchFilter searchFilter = JSONObject.parseObject(filter, SearchFilter.class);
         if (null != searchFilter.getVendUU()) {
-            info.filter("vendUU", searchFilter.getVendUU());
+            pageInfo.filter("vendUU", searchFilter.getVendUU());
         } else if (null != searchFilter.getEnUU()) {
-            info.filter("inquiry.enUU", searchFilter.getEnUU());
+            pageInfo.filter("inquiry.enUU", searchFilter.getEnUU());
         }
         if (null != _state) {
-            info = publicInquiryService.covert(info, _state);
+            pageInfo = publicInquiryService.covert(pageInfo, _state);
         }
-        return  publicInquiryService.findByPageInfo(info, searchFilter);
+        return  publicInquiryService.findByPageInfo(pageInfo, searchFilter);
     }
 
     /**

src/main/java/com/uas/ps/inquiry/page/PageParams.java

@@ -11,7 +11,7 @@ public class PageParams implements Serializable {
 	private int count;
 	private int page;
 	private String filter;
-	private String sorting;
+//	private String sorting;
 
 	public int getCount() {
 		return count;
@@ -38,11 +38,12 @@ public class PageParams implements Serializable {
 	}
 
 	public String getSorting() {
-		return sorting;
+//		return sorting;
+		return null;
 	}
 
 	public void setSorting(String sorting) {
-		this.sorting = sorting;
+//		this.sorting = sorting;
 	}
 
 	public PageParams(int count, int page, String filter, String sorting) {
@@ -50,7 +51,7 @@ public class PageParams implements Serializable {
 		this.count = count;
 		this.page = page;
 		this.filter = filter;
-		this.sorting = sorting;
+//		this.sorting = sorting;
 	}
 
 	public PageParams() {