更新认定单、招标单搜索参数的类型，处理搜索报错问题

src/main/java/com/uas/platform/b2b/controller/PurchaseTenderController.java

@@ -217,7 +217,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
@@ -245,7 +245,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -274,7 +274,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -304,7 +304,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("st_ispublish", Constant.YES);
@@ -338,7 +338,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("st_ispublish", Constant.YES);
@@ -368,7 +368,7 @@ public class PurchaseTenderController {
             return null;
         }
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -393,7 +393,7 @@ public class PurchaseTenderController {
         String keyword = jsonObject.getString("keyword");
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         HashMap<String, Object> map = new HashMap<>();
         map.put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
@@ -486,7 +486,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         return searchService.searchPurcTenderIds(keyword, pageParams);
@@ -536,7 +536,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -568,7 +568,7 @@ public class PurchaseTenderController {
         }
         buildFilter(filter, pageParams);
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
@@ -594,7 +594,7 @@ public class PurchaseTenderController {
         com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
         // 当前登录企业作为客户
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("pt_id", false, Sort.Type.LONG, 1L));
+        sortList.add(new Sort("pt_id", false, Sort.Type.INT, 1L));
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("pt_enuu", SystemSession.getUser().getEnterprise().getUu());
         SearchFilter filter = userService.distribute();
@@ -696,7 +696,8 @@ public class PurchaseTenderController {
     @ResponseBody
     public Page<PurchaseTender> getLatestOpenTender(PageParams params) {
         PageInfo info = new PageInfo(params);
-        info.sorting("date", org.springframework.data.domain.Sort.Direction.DESC); // 按发布日期倒序
+        // 按发布日期倒序
+        info.sorting("date", org.springframework.data.domain.Sort.Direction.DESC);
         return purchaseTenderService.findOpen(info);
     }
 

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -1129,7 +1129,8 @@ public class SaleOrderController {
 		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		List<Object> list = new ArrayList<>();
 		list.add(Constant.YES);
-		list.add((short) 2); // 建索引时，将不处于已结案状态，但是货物全部交接完毕的单，end值设为了2
+		// 建索引时，将不处于已结案状态，但是货物全部交接完毕的单，end值设为了2
+		list.add((short) 2);
 		ModelMap map = new ModelMap();
 		map.put("pu_end", new MultiValue(list, true));
 		map.put("pu_status", (short) Status.UNAUDIT.value());

src/main/java/com/uas/platform/b2b/controller/SaleSampleController.java

@@ -414,7 +414,7 @@ public class SaleSampleController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
 		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
@@ -459,7 +459,7 @@ public class SaleSampleController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
 		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);
@@ -501,7 +501,7 @@ public class SaleSampleController {
 			pageParams.getFilters().put(SearchConstants.END_DATE_KEY, endDate);
 		}
 		List<Sort> sortList = new ArrayList<>();
-		sortList.add(new Sort("psa_indate", false, Type.LONG, new Long(946659661)));
+		sortList.add(new Sort("psa_indate", false, Type.INT, new Long(946659661)));
 		sortList.add(new Sort("psa_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		return searchService.searchPurchaseProofingApprovalIds(keyword, pageParams);