'去掉框计算'

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

@@ -102,37 +102,13 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
                                                     Integer pageNum,
                                                     Integer pageSize,
                                                     Integer dispatchType,
-                                                    String carrierSsoId,
-                                                    String con){
-        if (con != null) {
-            if(!"undefined".equals(con)){
-                String index="get_pc_dispatch";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
+                                                    String carrierSsoId){
         mapValue.put("dispatchType",dispatchType);
         if (carrierSsoId != null && (carrierSsoId.equals("null") || carrierSsoId.equals("undefined"))) {
             carrierSsoId = null;
         }
         mapValue.put("carrierSsoId",carrierSsoId);
-        List<Map<String, Object>> dispatchSaleOrderList = null;
-        if (mapValue.size() == 2) {
-            //将查询结果存入索引中
-            dispatchSaleOrderList =  amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_pc_dispatch");
-            //添加id
-            map1.put("indexId","dispatchId");
-            dispatchSaleOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(dispatchSaleOrderList);
-            //删除
-            dispatchSaleOrderList.remove(dispatchSaleOrderList.size()-1);
-        }
-        if (dispatchSaleOrderList == null) {
-            dispatchSaleOrderList = amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
-        }
+        List<Map<String, Object>> dispatchSaleOrderList =  amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, dispatchSaleOrderList,columnList);

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

@@ -168,38 +168,12 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
                                         Integer apiId,
                                         Integer pageNum,
                                         Integer pageSize,
-                                        Integer issueStatus,
-                                        String con){
-        int count=0;
-        if(con != null){
-            if(!"undefined".equals(con)){
-                String index="get_truckno_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
+                                        Integer issueStatus){
         if (issueStatus != null) {
             mapValue.put("issueStatus",issueStatus);
-            count++;
         }
         //不分页筛选数据
-        List<Map<String, Object>> allSaleOrderList = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == count){
-            //将查询结果存入索引中
-            allSaleOrderList =  amsSaleOrderMaterialService.getTruckNoList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_truckno_list");
-            //添加id
-            map1.put("indexId","saleOrderMaterialId");
-            allSaleOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(allSaleOrderList);
-            //删除
-            allSaleOrderList.remove(allSaleOrderList.size()-1);
-        }
-        if(allSaleOrderList== null)
-            allSaleOrderList =  amsSaleOrderMaterialService.getTruckNoList(mapValue);
+        List<Map<String, Object>> allSaleOrderList =  amsSaleOrderMaterialService.getTruckNoList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderMaterialService.getTruckNoList(mapValue);