去掉框计算

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

@@ -77,36 +77,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (carrierId != null) {
             map.put("carrierId", carrierId);
         }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_sale_order_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(map, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allSaleOrderForCarrier = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (map.size() == count) {
-            //将查询结果存入索引中
-            allSaleOrderForCarrier = omstruckOrderService.selectSaleOrderForCarrier(map);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index", "get_sale_order_list");
-            //添加id
-            map1.put("indexId", "saleOrderId");
-            allSaleOrderForCarrier.add(map1);
-            //新建索引
-            esFeign.insertIndex(allSaleOrderForCarrier);
-            //删除
-            allSaleOrderForCarrier.remove(allSaleOrderForCarrier.size() - 1);
-        }
-        if (allSaleOrderForCarrier == null)
-            allSaleOrderForCarrier = omstruckOrderService.selectSaleOrderForCarrier(map);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderForCarrier = omstruckOrderService.selectSaleOrderForCarrier(map);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderForCarrier, saleOrderForCarrier);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, saleOrderForCarrier);
         return success(pageList);
     }
 
@@ -134,41 +108,14 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                       @PathVariable("carrierId") Integer carrierId,
                                                       String con
     ) {
-        int count = 0;
         //设置承运商
         if (carrierId != null) {
             map.put("carrierId", carrierId);
         }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_coke_dayplan_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(map, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allCokeDayPlanAndRecivedList = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (map.size() == count) {
-            //将查询结果存入索引中
-            allCokeDayPlanAndRecivedList = omstruckOrderService.selectSaleOrderForCarrier(map);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index", "get_coke_dayplan_list");
-            //添加id
-            map1.put("indexId", "cokeDayPlanId");
-            allCokeDayPlanAndRecivedList.add(map1);
-            //新建索引
-            esFeign.insertIndex(allCokeDayPlanAndRecivedList);
-            //删除
-            allCokeDayPlanAndRecivedList.remove(allCokeDayPlanAndRecivedList.size() - 1);
-        }
-        if (allCokeDayPlanAndRecivedList == null)
-            allCokeDayPlanAndRecivedList = omstruckOrderService.selectCokeDayPlanAndRecived(map);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> CokeDayPlanAndRecived = omstruckOrderService.selectCokeDayPlanAndRecived(map);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCokeDayPlanAndRecivedList, CokeDayPlanAndRecived);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, CokeDayPlanAndRecived);
         return success(pageList);
     }
 
@@ -199,42 +146,14 @@ public class OmstruckOrderController extends BaseRESTfulController {
 
     ) {
 
-        int count = 0;
         //设置承运商
         if (carrierId != null) {
             map.put("carrierId", carrierId);
-            count++;
-        }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_waterslag_dayplan_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(map, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allWaterSlagDayPlanAndRecivedList = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (map.size() == count) {
-            //将查询结果存入索引中
-            allWaterSlagDayPlanAndRecivedList = omstruckOrderService.selectSaleOrderForCarrier(map);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index", "get_waterslag_dayplan_list");
-            //添加id
-            map1.put("indexId", "cokeDayPlanId");
-            allWaterSlagDayPlanAndRecivedList.add(map1);
-            //新建索引
-            esFeign.insertIndex(allWaterSlagDayPlanAndRecivedList);
-            //删除
-            allWaterSlagDayPlanAndRecivedList.remove(allWaterSlagDayPlanAndRecivedList.size() - 1);
         }
-        if (allWaterSlagDayPlanAndRecivedList == null)
-            allWaterSlagDayPlanAndRecivedList = omstruckOrderService.selectCokeDayPlanAndRecived(map);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> CokeDayPlanAndRecived = omstruckOrderService.selectCokeDayPlanAndRecived(map);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allWaterSlagDayPlanAndRecivedList, CokeDayPlanAndRecived);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, CokeDayPlanAndRecived);
         return success(pageList);
 
     }
@@ -276,36 +195,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("orderTypee", orderType);
             count++;
         }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_all_order_sale";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allSaleOrderList = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            allSaleOrderList = omstruckOrderService.selectAllOrderForSale(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index", "get_all_order_sale");
-            //添加id
-            map1.put("indexId", "orderSaleId");
-            allSaleOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(allSaleOrderList);
-            //删除
-            allSaleOrderList.remove(allSaleOrderList.size() - 1);
-        }
-        if (allSaleOrderList == null)
-            allSaleOrderList = omstruckOrderService.selectAllOrderForSale(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> selectAllOrderForSale = omstruckOrderService.selectAllOrderForSale(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderList, selectAllOrderForSale);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, selectAllOrderForSale);
         return success(pageList);
 
     }
@@ -463,11 +356,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
         mapValue.put("capacityTypeId", 1);
         mapValue.put("capacityStatus", 0);
         //不分页筛选数据
-        List<Map<String, Object>> allCapacity = omstruckOrderService.getAllCapacity(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> capacity = omstruckOrderService.getAllCapacity(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity, capacity);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, capacity);
         return success(pageList);
     }
 
@@ -555,54 +447,23 @@ public class OmstruckOrderController extends BaseRESTfulController {
 
     ) {
 
-        int count = 0;
 
         if (carrierId != null) {
             map.put("carrierId", carrierId);
-            count++;
         }
         if (orderStatus != null) {
             map.put("orderStatus", orderStatus);
-            count++;
         }
         if (dayPlanId != null) {
             map.put("dayPlanId", dayPlanId);
-            count++;
         }
         if (orderType != null) {
             map.put("orderTypeId", orderType);
-            count++;
-        }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_coke_dayplan_order";//设置要查询的索引名称
-                return success(esFeign.getConResult(map, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allCokeRailPlanOrderListForOrder = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (map.size() == count) {
-            //将查询结果存入索引中
-            allCokeRailPlanOrderListForOrder = omstruckOrderService.selectCokeRailPlanForOrder(map);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index", "get_coke_dayplan_order");
-            //添加id
-            map1.put("indexId", "cokeDayPlanOrderId");
-            allCokeRailPlanOrderListForOrder.add(map1);
-            //新建索引
-            esFeign.insertIndex(allCokeRailPlanOrderListForOrder);
-            //删除
-            allCokeRailPlanOrderListForOrder.remove(allCokeRailPlanOrderListForOrder.size() - 1);
         }
-        if (allCokeRailPlanOrderListForOrder == null)
-            allCokeRailPlanOrderListForOrder = omstruckOrderService.selectCokeRailPlanForOrder(map);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> CokeDayPlanAndRecived = omstruckOrderService.selectCokeRailPlanForOrder(map);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCokeRailPlanOrderListForOrder, CokeDayPlanAndRecived);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, CokeDayPlanAndRecived);
         return success(pageList);
 
     }
@@ -628,54 +489,23 @@ public class OmstruckOrderController extends BaseRESTfulController {
 
 
     ) {
-        int count = 0;
         //设置承运商
         if (carrierId != null) {
             map.put("carrierId", carrierId);
-            count++;
         }
         if (dayPlanId != null) {
             map.put("dayPlanId", dayPlanId);
-            count++;
         }
         if (orderStatus != null) {
             map.put("orderStatus", orderStatus);
-            count++;
         }
         if (orderType != null) {
             map.put("orderType", orderType);
-            count++;
-        }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_water_slagplan_order";//设置要查询的索引名称
-                return success(esFeign.getConResult(map, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
         }
-        //不分页筛选数据
-        List<Map<String, Object>> allCokeRailPlanOrderListForOrder = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (map.size() == count) {
-            //将查询结果存入索引中
-            allCokeRailPlanOrderListForOrder = omstruckOrderService.selectWaterSlagForOrder(map);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index", "get_water_slagplan_order");
-            //添加id
-            map1.put("indexId", "getwaterSlagId");
-            allCokeRailPlanOrderListForOrder.add(map1);
-            //新建索引
-            esFeign.insertIndex(allCokeRailPlanOrderListForOrder);
-            //删除
-            allCokeRailPlanOrderListForOrder.remove(allCokeRailPlanOrderListForOrder.size() - 1);
-        }
-        if (allCokeRailPlanOrderListForOrder == null)
-            allCokeRailPlanOrderListForOrder = omstruckOrderService.selectWaterSlagForOrder(map);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> CokeDayPlanAndRecived = omstruckOrderService.selectWaterSlagForOrder(map);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCokeRailPlanOrderListForOrder, CokeDayPlanAndRecived);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, CokeDayPlanAndRecived);
         return success(pageList);
 
     }
@@ -731,18 +561,14 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                Integer orderStatus,
                                                String con
     ) {
-        int count = 0;
         if (orderType != null) {
             mapValue.put("orderTypee", orderType);
-            count++;
         }
         if (orderReceiveStatus != null) {
             mapValue.put("orderReceiveStatus", orderReceiveStatus);
-            count++;
         }
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
-            count++;
         }
         //分页数据
         List<Map<String, Object>> order = omstruckOrderService.getReceiveRefuseOrder(mapValue);
@@ -783,11 +609,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
         }
         mapValue.put("carrierSsoId",carrierSsoId);
         //不分页筛选数据
-        List<Map<String, Object>> DiverInfoForSale = omstruckOrderService.selectTransportOrderForSale(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> diverInfoForSaleorder = omstruckOrderService.selectTransportOrderForSale(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, DiverInfoForSale, diverInfoForSaleorder);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, diverInfoForSaleorder);
         return success(pageList);
     }
 
@@ -923,11 +748,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("carrierId", carrierId);
         }
         //不分页筛选数据
-        List<Map<String, Object>> allCapacity = omstruckOrderService.selectCapacityAndDriver(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> capacity = omstruckOrderService.selectCapacityAndDriver(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity, capacity);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, capacity);
         return success(pageList);
     }
 
@@ -972,11 +796,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("carrierId", carrierId);
         }
         //不分页筛选数据
-        List<Map<String, Object>> steelSaleForCarrier = omstruckOrderService.selectSteelSaleForCarrier(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> steelSaleForCarrier1 = omstruckOrderService.selectSteelSaleForCarrier(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, steelSaleForCarrier, steelSaleForCarrier1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, steelSaleForCarrier1);
         return success(pageList);
     }
 
@@ -1004,11 +827,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("orderType", orderType);
         }
         //不分页筛选数据
-        List<Map<String, Object>> steelSaleForCarrier = omstruckOrderService.selectCokeRailPlan(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> steelSaleForCarrier1 = omstruckOrderService.selectCokeRailPlan(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, steelSaleForCarrier, steelSaleForCarrier1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, steelSaleForCarrier1);
         return success(pageList);
     }
 
@@ -1039,11 +861,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("orderType", orderType);
         }
         //不分页筛选数据
-        List<Map<String, Object>> steelSaleForCarrier = omstruckOrderService.selectInfoByDayPlanId(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> steelSaleForCarrier1 = omstruckOrderService.selectInfoByDayPlanId(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, steelSaleForCarrier, steelSaleForCarrier1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, steelSaleForCarrier1);
         return success(pageList);
     }
 
@@ -1067,11 +888,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
     ) {
         mapValue.put("saleOrderId", saleOrderId);
         //不分页筛选数据
-        List<Map<String, Object>> steelSaleForCarrier = omstruckOrderService.selectInfoBySaleOrderId(saleOrderId);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> steelSaleForCarrier1 = omstruckOrderService.selectInfoBySaleOrderId(saleOrderId);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, steelSaleForCarrier, steelSaleForCarrier1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, steelSaleForCarrier1);
         return success(pageList);
 
     }
@@ -1131,36 +951,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                   Integer pageSize,
                                                   String con,
                                                   String carrierId) {
-        if (con != null) {
-            if(!"undefined".equals(con)){
-                String index="get_capacity_driver";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
-        if (carrierId != null && !"undefined".equals(carrierId)){
-            mapValue.put("carrierIds",carrierId);
-        }
-        List<Map<String, Object>> dispatchSaleOrderList = null;
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            dispatchSaleOrderList = omstruckOrderService.getCapacityAndDriverList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_capacity_driver");
-            //添加id
-            map1.put("indexId","driverCapacityId");
-            dispatchSaleOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(dispatchSaleOrderList);
-            //删除
-            dispatchSaleOrderList.remove(dispatchSaleOrderList.size()-1);
-        }
-        if (dispatchSaleOrderList == null) {
-            dispatchSaleOrderList = omstruckOrderService.getCapacityAndDriverList(mapValue);
-        }
+
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = omstruckOrderService.getCapacityAndDriverList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, dispatchSaleOrderList,columnList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);
         return success(pageList);
     }
 
@@ -1192,47 +986,20 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                String carrierId,
                                                String con,
                                                Integer planEnableStatus) {
-       if(con != null){
-           if(!"undefined".equals(con)){
-               String index = "get_purinward_order_list";
-               return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-           }
-       }
-        int count = 0;
+
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
         if (carrierId != null && !"undefined".equals(carrierId)) {
             mapValue.put("carrierId",carrierId);
-            count++;
         }
         if (planEnableStatus != null && !"undefined".equals(planEnableStatus)) {
             mapValue.put("planEnableStatus",planEnableStatus);
-            count++;
         }
         mapValue.put("orderStatus",orderStatus);
-        count++;
-        List<Map<String, Object>> dispatchSaleOrderList = null;
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            dispatchSaleOrderList = omstruckOrderService.getPurInwardOrderList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_purinward_order_list");
-            //添加id
-            map1.put("indexId","inwardOrderId");
-            dispatchSaleOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(dispatchSaleOrderList);
-            //删除
-            dispatchSaleOrderList.remove(dispatchSaleOrderList.size()-1);
-        }
-        if (dispatchSaleOrderList == null) {
-            dispatchSaleOrderList = omstruckOrderService.getPurInwardOrderList(mapValue);
-        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = omstruckOrderService.getPurInwardOrderList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, dispatchSaleOrderList,columnList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);
         return success(pageList);
     }
 

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

@@ -107,50 +107,19 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
                                           Integer orderType,
                                           Integer orderStatus,
                                           String  con) {
-        int count = 0;
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
-            count++;
         }
         if (orderType != null) {
             mapValue.put("orderType", orderType);
-            count++;
         }
         if (carrierId != null) {
             mapValue.put("carrierId", carrierId);
-            count++;
         }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_input_order_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allTruckOrder = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            allTruckOrder = omstruckOrderSeparateService.getInputOrderList(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_input_order_list");
-            //添加id
-            map.put("indexId", "truckOrderId");
-            allTruckOrder.add(map);
-            //新建索引
-            esFeign.insertIndex(allTruckOrder);
-            //删除
-            allTruckOrder.remove(allTruckOrder.size() - 1);
-            allTruckOrder.remove(allTruckOrder.size() - 1);
-        }
-        if (allTruckOrder == null)
-            allTruckOrder = omstruckOrderSeparateService.getInputOrderList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> truckOrder = omstruckOrderSeparateService.getInputOrderList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allTruckOrder, truckOrder);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, truckOrder);
         return success(pageList);
     }
 
@@ -175,7 +144,6 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
                                                  String usersId,
                                                  Integer type1
                                                  ) {
-        int count = 0;
         if (orderStatus != null) {
             mapValue.put("status", orderStatus);
         }
@@ -196,11 +164,10 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
             mapValue.put("usersId",usersId);
         }
         //框计算
-        List<Map<String, Object>> allMes = omstruckOrderSeparateService.getOthersOrderMesToSend(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> mes = omstruckOrderSeparateService.getOthersOrderMesToSend(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allMes, mes);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, mes);
         return success(pageList);
     }