txf преди 3 години
родител
ревизия
e20b192933

+ 1 - 4
src/main/java/com/steerinfo/dil/controller/TmstrainLoadingResultController.java

@@ -17,10 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * TmstrainLoadingResult RESTful接口:

+ 2 - 0
src/main/java/com/steerinfo/dil/controller/TmstrainPleaseApproveResultController.java

@@ -82,6 +82,7 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
         if (mapValue.size() == 2) {
             //将查询结果存入索引中
             wagonPleaseList = tmstrainPleaseApproveResultService.getAllWagonPlease(mapValue);
+            DataChange.changeDateToDayDate(wagonPleaseList, "resultPleaseDate", "resultPlanDate");
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index", "get_all_wagon_please");
@@ -224,6 +225,7 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
         if (mapValue.size() == 1 ) {
             //将查询结果存入索引中
             approveWagonPleaseList = tmstrainPleaseApproveResultService.getAllApproveWagonPlease(mapValue);
+            DataChange.changeDateToDayDate(approveWagonPleaseList, "resultApproveDate");
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index", "get_approve_wagon_please");

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -26,7 +26,7 @@ openfeign:
   ESFeign:
     url: ${ESFEIGN_URL:localhost:8089}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   WmsBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.161:8070}