合并master分支 合并冲突

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

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

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -29,7 +29,7 @@ public class ColumnDataUtil {
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
         for (Map<String, Object> columnData : columnDataList) {
             //每个表头字段的过滤条件
-            columnData.put("filters", setListMap(list, columnData.get("prop").toString()));
+            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
         }
         PageListAdd pageList = new PageListAdd(data);
         pageList.setColumnData(columnDataList);

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -622,8 +622,8 @@
                 rownum < 100
             </if>
         </where>
-    </select>
-    <select id="getOrderPlanEnable" resultType="java.lang.Integer">
+    </select>  
+  	<select id="getOrderPlanEnable" resultType="java.lang.Integer">
         SELECT  AIP.PLAN_EABLE_STATUS
         FROM
 	    OMSTRUCK_ORDER oo