tij

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

@@ -181,55 +181,25 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
         int count = 0;
         if (orderStatus != null) {
             mapValue.put("status", orderStatus);
-            count++;
         }
         if (type != null) {
             mapValue.put("type", type);
-            count++;
         }
         if (type1!=null){
             mapValue.put("type1",type1);
-            count++;
         }
         if (carrierId != null && !"undefined".equals(carrierId)) {
             mapValue.put("carrierId", carrierId);
-            count++;
         }
 
         if (userId!=null){
             mapValue.put("userId",userId);
-            count++;
         }
         if (usersId!=null){
             mapValue.put("usersId",usersId);
-            count++;
         }
         //框计算
-        if (con != null) {
-            if (!"undefined".equals(con)) {
-                String index = "get_others_order_list";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));//获取查询结果
-            }
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allMes = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            allMes = omstruckOrderSeparateService.getOthersOrderMesToSend(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index", "get_others_order_list");
-            //添加id
-            map.put("indexId", "othersOrderId");
-            allMes.add(map);
-            //新建索引
-            esFeign.insertIndex(allMes);
-            //删除
-            allMes.remove(allMes.size() - 1);
-        }
-        if (allMes == null)
-            allMes = omstruckOrderSeparateService.getOthersOrderMesToSend(mapValue);
+        List<Map<String, Object>> allMes = omstruckOrderSeparateService.getOthersOrderMesToSend(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> mes = omstruckOrderSeparateService.getOthersOrderMesToSend(mapValue);

src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderMaterialServiceImpl.java

@@ -30,6 +30,9 @@ import java.util.Map;
 @Service(value = "omstruckOrderMaterialService")
 public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialService {
 
+
+
+
     @Autowired
     private OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
 

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

@@ -2988,7 +2988,6 @@
                          TLFR.RESULT_ID "leaveResultId",
                          TUR.RESULT_ID "unloadResultId",
                          TER.RESULT_ID "enFactoryId"
-
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
                            ON OO.ORDER_ID=TTR.ORDER_ID