去掉所有框计算

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

@@ -74,11 +74,10 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
         if (orderType!=null){
             mapValue.put("orderTypee", orderType);
         }
-        List<Map<String, Object>>  allEnFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> enFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allEnFactoryResult,enFactoryResult);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,enFactoryResult);
         return success(pageList);
     }
 

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

@@ -96,11 +96,10 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
         if(con!=null&&con.equals("undefined")){
             mapValue.put("con","%"+con+"%");
         }
-        List<Map<String, Object>>  allLeaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> leaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allLeaveFactoryResult,leaveFactoryResult);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,leaveFactoryResult);
         return success(pageList);
     }
 

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

@@ -69,36 +69,11 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                                           Integer pageNum,
                                           Integer pageSize,
                                           String con){
-        //框计算
-        if(con != null){
-            if(!"undefined".equals(con)){
-                String index="get_sale_queue_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allQueueSaleOrder = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 0){
-            //将查询结果存入索引中
-            allQueueSaleOrder = tmstruckLoadResultService.getSaleOrderOnQueue(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_sale_queue_list");
-            //添加id
-            map.put("indexId","saleOrderQueueId");
-            allQueueSaleOrder.add(map);
-            //新建索引
-            esFeign.insertIndex(allQueueSaleOrder);
-            //删除
-            allQueueSaleOrder.remove(allQueueSaleOrder.size()-1);
-        }
-        if(allQueueSaleOrder == null)
-            allQueueSaleOrder = tmstruckLoadResultService.getSaleOrderOnQueue(mapValue);
+
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> queueSaleOrder = tmstruckLoadResultService.getSaleOrderOnQueue(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQueueSaleOrder,queueSaleOrder);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,queueSaleOrder);
         return success(pageList);
     }
 
@@ -142,12 +117,11 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         if (userIds!=null){
             mapValue.put("userIds",userIds);
         }
-        //如果有条件查询则跳过初始化，和创建索引
-        List<Map<String, Object>>   allLoadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
+
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> loadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allLoadResult,loadResult);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,loadResult);
         return success(pageList);
     }
 

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

@@ -66,38 +66,11 @@ public class TmstruckQualityResultController extends BaseRESTfulController {
                                           String con
     ){
         mapValue.put("orderTypee", orderType);
-        //框计算
-        if(con != null){
-            if(!"undefined".equals(con)){
-                String index="get_quality_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allQualityResult = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 0){
-            //将查询结果存入索引中
-            allQualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
-            DataChange.dataTo2Number(allQualityResult, "resultDeduction");
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_quality_list");
-            //添加id
-            map.put("indexId","qualityId");
-            allQualityResult.add(map);
-            //新建索引
-            esFeign.insertIndex(allQualityResult);
-            //删除
-            allQualityResult.remove(allQualityResult.size()-1);
-        }
-        if(allQualityResult == null)
-            allQualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> qualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
         DataChange.dataTo2Number(qualityResult, "resultDeduction");
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQualityResult,qualityResult);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,qualityResult);
         return success(pageList);
     }
 

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

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

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

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

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

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

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

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

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

@@ -63,11 +63,10 @@ public class TmstruckTotalResultController extends BaseRESTfulController {
                                         Integer pageSize
     ){
         //不分页筛选数据
-        List<Map<String, Object>> allCountList = tmstruckTotalResultService.selectCountList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> countList = tmstruckTotalResultService.selectCountList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCountList,countList);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,countList);
         return success(pageList);
     }
 
@@ -86,11 +85,10 @@ public class TmstruckTotalResultController extends BaseRESTfulController {
                                                 Integer pageSize
     ){
         //不分页筛选数据
-        List<Map<String, Object>> allQualityResult = tmstruckTotalResultService.getTmstruckMonthResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> qualityResult = tmstruckTotalResultService.getTmstruckMonthResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQualityResult,qualityResult);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,qualityResult);
         return success(pageList);
     }
 }

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

@@ -72,13 +72,10 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
         if (userIds!=null){
             mapValue.put("userIds",userIds);
         }
-        //不分页筛选数据
-        List<Map<String, Object>> allUnloadResult = null;
-        allUnloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> unloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allUnloadResult,unloadResult);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,unloadResult);
         return success(pageList);
     }
 

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

@@ -84,13 +84,10 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         if (usersId!=null){
             mapValue.put("usersId",usersId);
         }
-        List<Map<String, Object>> allJiMaoResult = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        allJiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> jiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allJiMaoResult,jiMaoResult);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,jiMaoResult);
         return success(pageList);
     }
 
@@ -123,14 +120,10 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         if (userIds!=null) {
             mapValue.put("usersId", userIds);
         }
-        //不分页筛选数据
-        List<Map<String, Object>> allJiPiResult = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        allJiPiResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> jiPiResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allJiPiResult,jiPiResult);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,jiPiResult);
         return success(pageList);
     }
 

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

@@ -106,19 +106,18 @@ public class DataChange {
      * @param key
      */
     public static void dataTo2Number(List<Map<String, Object>> list, String ...key){
+        DecimalFormat df =  new DecimalFormat("0.00");
         //遍历List
         for (Map<String, Object> map : list) {
             for (String s : key) {
                 //修改数据为带两位小数
                 try {
-                    BigDecimal oldDate = (BigDecimal) map.get(s);
-                    DecimalFormat df =  new DecimalFormat("0.00");
+                    BigDecimal oldDate = dataToBigDecimal(map.get(s));
                     String resultDeduction = df.format(oldDate.doubleValue());
                     map.put(s, resultDeduction);
                 } catch (Exception e) {
                     System.out.println("原料扣减量数据有误");
                 }
-
             }
         }
     }