xiugai

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

@@ -132,7 +132,7 @@ public class OmsshipShipmentInstructionsController extends BaseRESTfulController
         //初始化过滤
         List<Map<String, Object>> detailListTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapVal == null) {
+        if (mapVal.size() == 0) {
             //将查询结果存入索引中
             detailListTotal = omsshipShipmentInstructionsService.selectAll(null);
             Map<String, Object> map = new HashMap<>();

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

@@ -154,7 +154,7 @@ public class TmsshipBargeOperationController extends BaseRESTfulController {
         //初始化过滤
         List<Map<String, Object>> detailListTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapVal == null) {
+        if (mapVal.size() == 0) {
             //将查询结果存入索引中
             detailListTotal = tmsshipBargeOperationService.selectBargeOperationList(null);
             Map<String, Object> map = new HashMap<>();

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

@@ -154,14 +154,14 @@ public class TmsshipLoadShipResultController extends BaseRESTfulController {
         //初始化过滤
         List<Map<String, Object>> detailListTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapVal == null) {
+        if (mapVal.size() == 0) {
             //将查询结果存入索引中
             detailListTotal = tmsshipLoadShipResultService.selectLoadShipList(null);
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index", "get_load_ship_list");
             //添加id
-            map.put("indexId", "resultId");
+            map.put("indexId", "loadResultId");
             detailListTotal.add(map);
             //新建索引
             String s = JSON.toJSONString(detailListTotal);

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

@@ -158,7 +158,7 @@ public class TmsshipShipLocationController extends BaseRESTfulController {
         //初始化过滤
         List<Map<String, Object>> detailListTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapVal == null) {
+        if (mapVal.size() == 0) {
             //将查询结果存入索引中
             detailListTotal = tmsshipShipLocationService.selectShipLocationList(null);
             Map<String, Object> map = new HashMap<>();

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

@@ -81,14 +81,14 @@ public class TmsshipTotalResultController extends BaseRESTfulController {
         //初始化过滤
         List<Map<String, Object>> detailListTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapVal == null) {
+        if (mapVal.size() == 0) {
             //将查询结果存入索引中
             detailListTotal = tmsshipTotalResultService.getOrderList(null);
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index", "get_all_order_list");
             //添加id
-            map.put("indexId", "resultId");
+            map.put("indexId", "totalResultId");
             detailListTotal.add(map);
             //新建索引
             String s = JSON.toJSONString(detailListTotal);

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

@@ -146,7 +146,7 @@ public class TmsshipUnloadShipResultController extends BaseRESTfulController {
         if(con != null){
             if(!"undefined".equals(con)){
                 //设置要查询的索引名称
-                String index="get_unLoad_ship_list";
+                String index="get_unload_ship_list";
                 //获取查询结果
                 return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
             }
@@ -154,14 +154,14 @@ public class TmsshipUnloadShipResultController extends BaseRESTfulController {
         //初始化过滤
         List<Map<String, Object>> detailListTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapVal == null) {
+        if (mapVal.size() == 0) {
             //将查询结果存入索引中
             detailListTotal = tmsshipUnloadShipResultService.selectUnloadShipList(null);
             Map<String, Object> map = new HashMap<>();
             //添加索引
-            map.put("index", "get_unLoad_ship_list");
+            map.put("index", "get_unload_ship_list");
             //添加id
-            map.put("indexId", "resultId");
+            map.put("indexId", "unloadResultId");
             detailListTotal.add(map);
             //新建索引
             String s = JSON.toJSONString(detailListTotal);

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

@@ -154,14 +154,14 @@ public class TmsshipWaterQualityResultController extends BaseRESTfulController {
         //初始化过滤
         List<Map<String, Object>> detailListTotal = null;
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapVal == null) {
+        if (mapVal.size() == 0) {
             //将查询结果存入索引中
             detailListTotal = tmsshipWaterQualityResultService.selectWaterQualityList(null);
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index", "get_water_quality_list");
             //添加id
-            map.put("indexId", "resultId");
+            map.put("indexId", "waterResultId");
             detailListTotal.add(map);
             //新建索引
             String s = JSON.toJSONString(detailListTotal);