Merge branch 'dev'

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -744,36 +744,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("orderStatus", orderStatus);
             count++;
         }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_receiverefuse_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allOrder = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            allOrder = omstruckOrderService.getReceiveRefuseOrder(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_receiverefuse_list");
-            //添加id
-            map.put("indexId", "orderReceiveId");
-            allOrder.add(map);
-            //新建索引
-            esFeign.insertIndex(allOrder);
-            //删除
-            allOrder.remove(allOrder.size() - 1);
-        }
-        if (allOrder == null)
-            allOrder = omstruckOrderService.getReceiveRefuseOrder(mapValue);
-        PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> order = omstruckOrderService.getReceiveRefuseOrder(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allOrder, order);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, order);
         return success(pageList);
     }
 
@@ -887,18 +860,14 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                               String carrierSSOId,
                                               String con
     ) {
-        int count = 0;
         if (orderType != null) {
             mapValue.put("orderTypee", orderType);
-            count++;
         }
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
-            count++;
         }
         if (fuelOrder != null) {
             mapValue.put("fuelOrder", fuelOrder);
-            count++;
         }
         if(carrierSSOId != null){
             if(!"null".equals(carrierSSOId)){