add

src/main/resources/application-prod.yml

@@ -20,7 +20,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.33.166:8079}
   ImFeign:

src/main/resources/bootstrap.yml

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

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

@@ -3725,7 +3725,13 @@
         FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
         WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
         AND TTTR2.RESULT_TIME_TYPE = 3
-        ) "totalTime"
+        ) "totalTime",
+        (
+        SELECT TTTR2.RESULT_ABOUT_TIME
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 3
+        ) "aboutTime"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON OO.ORDER_PLAN_ID = AIP.PLAN_ID

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

@@ -715,6 +715,7 @@
             OO.ORDER_ID "orderId",
             ( SELECT TTTR2.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR2 WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR2.RESULT_TIME_TYPE = 1 ) "startTime",
             ( SELECT TTTR3.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "endTime",
+            ( SELECT TTTR3.RESULT_ABOUT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "aboutTime",
             ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
             TTTR.INSERT_TIME "insertTime",
             RM.MATERIAL_NAME "materialName"