干掉框计算

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

@@ -57,37 +57,10 @@ public class AmsContractBreachController extends BaseRESTfulController {
                                           Integer apiId,
                                           String con) {
 
-        //框计算
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_breach_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String, Object>> allBreachList = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 0){
-            //将查询结果存入索引中
-            allBreachList = amsContractBreachService.getBreachList(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_breach_list");
-            //添加id
-            map.put("indexId","breachListId");
-            allBreachList.add(map);
-            //新建索引
-            esFeign.insertIndex(allBreachList);
-            //删除
-            allBreachList.remove(allBreachList.size()-1);
-        }
-        if(allBreachList == null)
-            allBreachList = amsContractBreachService.getBreachList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> enFactoryResult = amsContractBreachService.getBreachList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allBreachList,enFactoryResult);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,enFactoryResult);
         return success(pageList);
     }
 

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

@@ -51,11 +51,10 @@ public class AmsContractOtherPriceController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
-        List<Map<String, Object>> list = amsContractOtherPriceService.getLoadUnloadPriceList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractOtherPriceService.getLoadUnloadPriceList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -51,11 +51,10 @@ public class AmsContractTrainPriceController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
-        List<Map<String, Object>> list = amsContractTrainPriceService.getTrainPriceList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractTrainPriceService.getTrainPriceList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -52,11 +52,10 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId) {
-        List<Map<String, Object>> list = amsContractTransportPriceService.getShipPriceList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractTransportPriceService.getShipPriceList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -141,11 +140,10 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
-        List<Map<String, Object>> list = amsContractTransportPriceService.getAmsContractTransportPrice(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractTransportPriceService.getAmsContractTransportPrice(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -168,11 +166,10 @@ public class AmsContractTransportPriceController extends BaseRESTfulController {
                                            Integer pageNum,
                                            Integer pageSize,
                                            Integer apiId) {
-        List<Map<String, Object>> list = amsContractTransportPriceService.getSaleTruckPriceList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsContractTransportPriceService.getSaleTruckPriceList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -200,11 +200,10 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
             mapValue.put("con","%" + con + "%");
         }
         //不分页筛选数据
-        List<Map<String, Object>>  allSaleOrderList =  amsContractTruckPriceService.getAddressDeliveryAddress(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsContractTruckPriceService.getAddressDeliveryAddress(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
 
 

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

@@ -85,10 +85,9 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
             carrierSsoId = null;
         }
         mapValue.put("carrierSsoId",carrierSsoId);
-        List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
         PageHelper.startPage(pageNum,pageSize);
-        List<Map<String, Object>> amsSaleOrder1 = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder);
         return success(pageList);
     }
 
@@ -108,10 +107,9 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
             carrierSsoId = null;
         }
         mapValue.put("carrierSsoId",carrierSsoId);
-        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);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);
         return success(pageList);
     }
 

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

@@ -61,11 +61,10 @@ public class AmsRailOffsetDayplanController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("dayplanId",dayplanId);
-        List<Map<String, Object>> list = amsRailOffsetDayplanService.getMaterialMesByDayPlanId(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsRailOffsetDayplanService.getMaterialMesByDayPlanId(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -124,11 +123,10 @@ public class AmsRailOffsetDayplanController extends BaseRESTfulController {
             mapValue.put("carrierId", new BigDecimal(carrierId));
         }
         mapValue.put("dayplanReceiveStatus",new BigDecimal(dayplanReceiveStatus));
-        List<Map<String, Object>> list = amsRailOffsetDayplanService.getRailOffsetDayplan(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsRailOffsetDayplanService.getRailOffsetDayplan(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -144,11 +142,10 @@ public class AmsRailOffsetDayplanController extends BaseRESTfulController {
         }
 
         mapValue.put("dayPlanId",new BigDecimal(dayPlanId));
-        List<Map<String, Object>> list = amsRailOffsetDayplanService.getRailOffsetDayplanId(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsRailOffsetDayplanService.getRailOffsetDayplanId(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -73,10 +73,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                          Integer pageNum,
                                          Integer pageSize){
 
-        List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getSaleOrderInfo(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfo(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -90,10 +89,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize){
 
-        List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getSaleOrderReported(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReported(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -107,10 +105,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize){
 
-        List<Map<String, Object>> amsSaleOrder = amsSaleOrderService.getAmsSaleOrderApproved(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getAmsSaleOrderApproved(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrder,amsSaleOrder1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
@@ -127,10 +124,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("saleOrderId",saleOrderId);
-        List<Map<String, Object>> amsSaleOrderDetail = amsSaleOrderService.getSaleOrderDetail(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrderDetail1 = amsSaleOrderService.getSaleOrderDetail(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrderDetail,amsSaleOrderDetail1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrderDetail1);
         return success(pageList);
     }
 
@@ -231,10 +227,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("saleOrderId",saleOrderId);
-        List<Map<String, Object>> amsSaleOrderUpdate = amsSaleOrderService.getSaleOrderUpdateLog(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrderUpdate1 = amsSaleOrderService.getSaleOrderUpdateLog(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSaleOrderUpdate,amsSaleOrderUpdate1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrderUpdate1);
         return success(pageList);
     }
 
@@ -297,40 +292,13 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer status,
                                           String con) {
-        int count=0;
         if (status!=null){
             mapValue.put("status",status);
-            count++;
         }
-        if(con != null){
-            if(!"undefined".equals(con)){
-                String index="get_sale_orderlist";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allSaleOrderList = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == count){
-            //将查询结果存入索引中
-            allSaleOrderList =  amsSaleOrderService.getSaleOrderList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_sale_orderlist");
-            //添加id
-            map1.put("indexId","saleOrderId");
-            allSaleOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(allSaleOrderList);
-            //删除
-            allSaleOrderList.remove(allSaleOrderList.size()-1);
-        }
-        if(allSaleOrderList== null)
-            allSaleOrderList =  amsSaleOrderService.getSaleOrderList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
 
     }
@@ -350,11 +318,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           Integer apiId) {
-        List<Map<String, Object>> saleCompanyList =  amsSaleOrderService.getSaleOrderListBySaleCompany(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListBySaleCompany(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, saleCompanyList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
 
     }
@@ -417,11 +384,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                  Integer apiId,
                                                  Integer status) {
         mapValue.put("status",status);
-        List<Map<String, Object>> list = amsSaleOrderMaterialService.getSaleMaterial(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsSaleOrderMaterialService.getSaleMaterial(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -471,11 +437,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId) {
-        List<Map<String, Object>> list = amsDispatchSaleOrderService.getOpenDispatchSaleOrder(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsDispatchSaleOrderService.getOpenDispatchSaleOrder(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -582,10 +547,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("saleOrderId",saleOrderId);
-        List<Map<String,Object>> mapList = amsSaleOrderService.getSaleOrderAndMaterialById(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columndata = amsSaleOrderService.getSaleOrderAndMaterialById(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, mapList,columndata);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columndata);
         return success(pageList);
     }
 
@@ -605,11 +569,10 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue.put("con","%" + con + "%");
         }
         //不分页筛选数据
-        List<Map<String, Object>> saleCompanyList =  amsSaleOrderService.getCokeSaleOrderList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getCokeSaleOrderList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, saleCompanyList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
     }
 }

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

@@ -173,11 +173,10 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
             mapValue.put("issueStatus",issueStatus);
         }
         //不分页筛选数据
-        List<Map<String, Object>> allSaleOrderList =  amsSaleOrderMaterialService.getTruckNoList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderMaterialService.getTruckNoList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSaleOrderList,saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
     }
 

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

@@ -61,10 +61,9 @@ public class AmsSalePlanController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize){
 
-        List<Map<String, Object>> amsSalePlan = amsSalePlanService.getSalePlanInfo(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSalePlan1 = amsSalePlanService.getSalePlanInfo(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSalePlan,amsSalePlan1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSalePlan1);
         return success(pageList);
     }
 

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

@@ -62,10 +62,9 @@ public class AmsSalePlanMaterialController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("planId",planId);
-        List<Map<String, Object>> amsSalePlanMaterial = amsSalePlanMaterialService.getSalePlanMaterialInfo(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSalePlanMaterial1 = amsSalePlanMaterialService.getSalePlanMaterialInfo(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsSalePlanMaterial,amsSalePlanMaterial1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSalePlanMaterial1);
         return success(pageList);
     }
 

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

@@ -62,10 +62,9 @@ public class AmsSaleTrucknoMaterialController extends BaseRESTfulController {
             mapValue = new HashMap<>();
         }
         mapValue.put("saleOrderMaterialId",saleOrderMaterialId);
-        List<Map<String, Object>> amsTruckNoDetail = amsSaleTrucknoMaterialService.getTruckNoDetail(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsTruckNoDetail1 = amsSaleTrucknoMaterialService.getTruckNoDetail(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, amsTruckNoDetail,amsTruckNoDetail1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsTruckNoDetail1);
         return success(pageList);
     }
 

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

@@ -148,11 +148,10 @@ public class AmstruckInwardPlanController extends BaseRESTfulController {
             mapValue.put("planId",new BigDecimal(planId));
         }
         mapValue.put("planStatus",new BigDecimal(planStatus));
-        List<Map<String, Object>> list = amstruckInwardPlanService.getTruckPlanList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardPlanService.getTruckPlanList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -149,11 +149,10 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
             mapValue.put("orgCode",orgCode);
         }
         mapValue.put("requirementStatus",requirementStatus);
-        List<Map<String, Object>> truckRequirementList  = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
     //展示采购内转需求
@@ -185,13 +184,10 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
             mapValue.put("planStatus",planStatus);
         }
         mapValue.put("requirementStatus",requirementStatus);
-        List<Map<String, Object>> truckRequirementList = null;
-        //将查询结果存入索引中
-        truckRequirementList =  amstruckInwardRequirementService.getPurRequirementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getPurRequirementList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -208,38 +204,11 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer apiId,
                                                  String  con) {
-//        if (con != null) {
-//            if (!con.equals("undefined")) {
-//                String index="get_purchase_batch";//设置要查询的索引名称
-//                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-//            }
-//        }
-//        if (mapValue == null) {
-//            mapValue = new HashMap<>();
-//        }
-//        List<Map<String, Object>> truckRequirementList = null;
-//        if (mapValue.size() == 0) {
-//            //将查询结果存入索引中
-//            truckRequirementList =  amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
-//            Map<String, Object> map1 = new HashMap<>();
-//            //添加索引
-//            map1.put("index","get_purchase_batch");
-//            //添加id
-//            map1.put("indexId","purchaseOrderId");
-//            truckRequirementList.add(map1);
-//            //新建索引
-//            esFeign.insertIndex(truckRequirementList);
-//            //删除
-//            truckRequirementList.remove(truckRequirementList.size()-1);
-//        }
-//        if (truckRequirementList == null) {
-//            truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
-//        }
-        List<Map<String,Object>> truckRequirementList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
+
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getPurchaseIdByBatch(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -265,11 +234,10 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
                                               Integer apiId,
                                               String con) {
 
-        List<Map<String, Object>>   truckRequirementList = amstruckInwardRequirementService.getWareHouse(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getWareHouse(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckRequirementList, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

@@ -67,39 +67,11 @@ public class AmstruckPurplanController extends BaseRESTfulController {
                                            Integer status,String con){
 
         mapValue.put("planStatus", status);
-        //框计算
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_pur_plan_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> allPurPlan = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 1){
-            //将查询结果存入索引中
-            allPurPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_pur_plan_list");
-            //添加id
-            map.put("indexId","purPlanId");
-            allPurPlan.add(map);
-            //新建索引
-            esFeign.insertIndex(allPurPlan);
-            //删除
-            allPurPlan.remove(allPurPlan.size()-1);
-        }
-        if(allPurPlan == null) {
-            allPurPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-        }
+
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> purPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPurPlan,purPlan);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,purPlan);
         return success(pageList);
     }
 
@@ -190,51 +162,11 @@ public class AmstruckPurplanController extends BaseRESTfulController {
                                                Integer status,
                                                Integer planStatus,
                                                String con){
-        int count = 0;
         if(planId != null){
             mapValue.put("planId", planId);
-            count++;
         }
         if(status != null){
             mapValue.put("planStatus", status);
-            count++;
-        }
-        //框计算
-        if(con != null){
-            if(!"undefined".equals(con)){
-                String index="get_decomposed_list";    //设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allPlan = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == count){
-            //将查询结果存入索引中
-            if (planStatus != 0) {
-                allPlan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-            }
-            else {
-                allPlan = amstruckPurplanMaterialService.getUnStartDecomposedPlan(mapValue);
-            }
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_decomposed_list");
-            //添加id
-            map.put("indexId","decomposedPlanId");
-            allPlan.add(map);
-            //新建索引
-            esFeign.insertIndex(allPlan);
-            //删除
-            allPlan.remove(allPlan.size()-1);
-        }
-        if(allPlan == null) {
-            if (planStatus != 0) {
-                allPlan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-            }
-            else {
-                allPlan = amstruckPurplanMaterialService.getUnStartDecomposedPlan(mapValue);
-            }
         }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
@@ -245,7 +177,7 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         else {
             plan = amstruckPurplanMaterialService.getUnStartDecomposedPlan(mapValue);
         }
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPlan,plan);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, plan);
         return success(pageList);
     }
 }

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

@@ -127,11 +127,10 @@ public class AmstruckRailDayplanController extends BaseRESTfulController {
                                              Integer apiId,
                                              Integer status) {
         mapValue.put("status", status);
-        List<Map<String, Object>> list = amstruckRailDayplanService.getTruckRailDayPlan(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckRailDayplanService.getTruckRailDayPlan(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
     /**
@@ -150,11 +149,10 @@ public class AmstruckRailDayplanController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer status) {
         mapValue.put("status", status);
-        List<Map<String, Object>> list = amstruckRailDayplanService.getSzTruckRailDayPlan(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckRailDayplanService.getSzTruckRailDayPlan(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

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

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

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

@@ -66,11 +66,10 @@ public class DilNoticeController extends BaseRESTfulController {
                                          Integer pageNum,
                                          Integer pageSize,
                                          Integer apiId){
-        List<Map<String,Object>> list = dilNoticeService.getNoticeList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getNoticeList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -87,11 +86,10 @@ public class DilNoticeController extends BaseRESTfulController {
                                        Integer pageNum,
                                        Integer pageSize,
                                        Integer apiId){
-        List<Map<String,Object>> list = dilNoticeService.getMarketingNoticeList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getMarketingNoticeList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -108,11 +106,10 @@ public class DilNoticeController extends BaseRESTfulController {
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer apiId){
-        List<Map<String,Object>> list = dilNoticeService.getCarrierNoticeList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getCarrierNoticeList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -128,11 +125,10 @@ public class DilNoticeController extends BaseRESTfulController {
                                                 Integer pageNum,
                                                 Integer pageSize,
                                                 Integer apiId){
-        List<Map<String,Object>> list = dilNoticeService.getClientNoticeList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getClientNoticeList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -228,40 +224,10 @@ public class DilNoticeController extends BaseRESTfulController {
         if (mapValue==null){
             mapValue=new HashMap<>();
         }
-        //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                //设置要查询的索引名称
-                String index = "get_notice_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
-            }
-        }
-        //初始化过滤
-        List<Map<String, Object>> listTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
-            //将查询结果存入索引中
-            listTotal = dilNoticeService.getNoticeList(null);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_notice_list");
-            //添加id
-            map.put("indexId", "noticeId");
-            listTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(listTotal);
-            esFeign.insertIndex(listTotal);
-            //删除
-            listTotal.remove(listTotal.size() - 1);
-        }
-        if (listTotal == null) {
-            listTotal = dilNoticeService.getNoticeList(mapValue);
-        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = dilNoticeService.getNoticeList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/ams
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8