分页查询pageInfo改成JSON通用格式

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

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