修改去掉框计算、

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

@@ -88,57 +88,30 @@ public class AmstruckSporadicOrderController extends BaseRESTfulController {
                                                String userId,
                                                String userIds) {
 
-        if (con != null && !con.equals("undefined")) {
-            String index="get_sporadic_order_list";//设置要查询的索引名称
-            return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-        }
-        int count=0;
+
         if (orderType!=null){
             mapValue.put("orderType",orderType);
-            count++;
         }
         if (issueStatus!=null){
             mapValue.put("issueStatus",issueStatus);
-            count++;
         }
         if (dispatchStatus!=null){
             mapValue.put("dispatchStatus",dispatchStatus);
-            count++;
         }
         if (sporadicStatus!=null){
             mapValue.put("sporadicStatus",sporadicStatus);
-            count++;
         }
         if (carrierSsoId!=null){
             mapValue.put("carrierSsoId",carrierSsoId);
-            count++;
         }
         if (userId!=null){
             mapValue.put("userId",userId);
-            count++;
         }
         if (userIds!=null){
             mapValue.put("userIds",userIds);
-            count++;
         }
         List<Map<String, Object>> sporadicOrderList = null;
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            sporadicOrderList =  amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_sporadic_order_list");
-            //添加id
-            map1.put("indexId","sporadicOrderId");
-            sporadicOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(sporadicOrderList);
-            //删除
-            sporadicOrderList.remove(sporadicOrderList.size()-1);
-        }
-        if (sporadicOrderList == null) {
-            sporadicOrderList = amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
-        }
+        sporadicOrderList = amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = amstruckSporadicOrderService.getSporadicOrdersList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, sporadicOrderList,columnList);