'修改船运bug'

src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: dil0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-shiptms-api-dev

src/main/resources/application-prod.yml

@@ -1,8 +1,9 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: dil
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-shiptms-api-dev
+    name: dil-shiptms-api-dev
+

src/main/resources/bootstrap.yml

@@ -22,7 +22,11 @@ openfeign:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@discovery.steerinfo.com/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:paas-discovery-test.steerinfo.com}:${EUREKA_PORT:80}/eureka/
+  instance:
+    prefer-ip-address: true
+    status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
+    instance-id: ${spring.cloud.client.ip-address}:${server.port}
 
 genxml:
   pth: com/a

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

@@ -580,7 +580,7 @@
         from
         (select
         t1.RESULT_NUMBER "resultNumber",
-        t4.CARRIER_NAME "carrierName",
+        t4.PORT_NAME "carrierName",
         t1.RESULT_CONTACT_PERSON "resultContactPerson",
         t1.RESULT_TELEPHONE_FAX "ResultTelephoneFax",
         t2.PIER_NAME "pierName",
@@ -591,15 +591,13 @@
         t1.RESULT_FREIGHT_FORWARDING_INFO "resultInfo",
         t1.CARGO_TRANSFER_RESULT_ID "cargoTransferResultId",
         t1.RESULT_MEMO "resultMemo"
-
-
         from AMSSHIP_CARGO_TRANSFER_RESULT t1
         left join RMS_PIER t2
         on t1.GROUP_ID=t2.PIER_ID
         left join AMSSHIP_DELIVERY_NOTICE t3
         on t1.BATCH_ID=t3.BATCH_ID
-        left join APPOINT_CARRIER t4
-        on t1.CARRIER_ID=t4.CARRIER_ID
+        left join RMS_PORT t4
+        on t1.CARRIER_ID=t4.PORT_ID
         left join DIL_BATCH t5
         on t1.BATCH_ID=t5.BATCH_ID
         left join RMS_MATERIAL t6

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

@@ -578,7 +578,7 @@
         on t1.BATCH_ID=t2.BATCH_ID
         left join RMS_SHIPPER t3
         on t2.REQUESTER_GROUP_ID=t3.SHIPPER_ID
-        left join APPOINT_CARRIER t4
+        left join RMS_CARRIER t4
         on t2.CARRIER_ID=t4.CARRIER_ID
         left join RMS_PORT t5
         on t1.PORT_ID=t5.PORT_ID

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

@@ -663,7 +663,6 @@
     select
     t3.SHIPPER_NAME  "shipperName",
     t4.CARRIER_NAME "carrierName",
-
     t1.NOTICE_COMMERCE_METHOD   "noticeCommerceMethod",
     t1.NOTICE_HANDOVER_METHOD   "noticeHandoverMethod",
     t1.NOTICE_PORT_CONSTRUCTION_FEE  "noticePortConstructionFee",
@@ -674,16 +673,14 @@
     t1.PURCHASE_CONTRACT_QUALITYINDEX "purchaseContractQualityindex",
     t8.MATERIAL_NAME "materialName",
     t7.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-
     t5.RESULT_NUMBER_OF_LOANS  "resultNumberOfLoans",
     t6.PORT_NAME "portName",
     t1.NOTICE_ID  "noticeId",
     t1.BATCH_ID "batchId"
-
     from  AMSSHIP_DELIVERY_NOTICE t1
     left join RMS_SHIPPER t3
     on t1.REQUESTER_GROUP_ID=t3.SHIPPER_ID
-    left join APPOINT_CARRIER t4
+    left join RMS_CARRIER t4
     on t1.CARRIER_ID=t4.CARRIER_ID
     left join AMSSHIP_CARGO_TRANSFER_RESULT t5
     on t1.BATCH_ID=t5.BATCH_ID
@@ -793,11 +790,11 @@
   <!--  下拉框中获取承运单位 -->
   <select id="getcarrier" resultType="java.util.LinkedHashMap">
     select
-      AC.CARRIER_ID   "id",
-      AC.CARRIER_ID   "value",
-      AC.CARRIER_NAME  "label"
+      RC.CARRIER_ID   "id",
+      RC.CARRIER_ID   "value",
+      RC.CARRIER_NAME  "label"
     from
-      APPOINT_CARRIER   AC
+      RMS_CARRIER   RC
   </select>
   <!--  下拉框中获取托运单位 -->
   <select id="getShipper" resultType="java.util.LinkedHashMap">

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

@@ -377,7 +377,7 @@
         db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
         rc.CAPACITY_NUMBER as "capacityName",
         rsh.SHIPPER_ABBREVIATION as "shipperAbbreviation",
-        rsu.SUPPLIER_ABBREVIATION as "supplierAbbreviation",
+        rsu.CARRIER_NAME as "supplierAbbreviation",
         pier.PIER_NAME as "groupName",
         tlsr.RESULT_LOAD_SHIP_DATE as "resultLoadShipDate",
         rps.PORT_NAME as "startPortName",
@@ -404,8 +404,8 @@
         ON actr.BATCH_ID = adn.BATCH_ID
         LEFT JOIN RMS_SHIPPER rsh
         ON adn.REQUESTER_GROUP_ID = rsh.SHIPPER_ID
-        LEFT JOIN RMS_SUPPLIER rsu
-        ON adn.CARRIER_ID = rsu.SUPPLIER_ID
+        LEFT JOIN RMS_CARRIER rsu
+        ON adn.CARRIER_ID = rsu.CARRIER_ID
         LEFT JOIN RMS_PIER pier
         ON pier.PIER_ID = actr.GROUP_ID
         LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr