Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-DAZHOU-TMSSHIP-API

src/main/java/com/steerinfo/dil/mapper/RmsCapacityMapper.java

@@ -17,6 +17,6 @@ public interface RmsCapacityMapper extends IBaseMapper<RmsCapacity, BigDecimal>
     BigDecimal selectCapacityId();
 
    //根据运力车牌查看运力id
-    Map<String,Object> getCapacityIdByCapacityNumber(String capacityNumber);
+    List<Map<String,Object>> getCapacityIdByCapacityNumber(String capacityNumber);
 
 }

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

@@ -74,10 +74,10 @@ public class OmsshipInstructionsCapacityServiceImpl implements IOmsshipInstructi
            //查询运力表中是否含有对应的运力编号
             BigDecimal capacityId=null;
             BigDecimal bookingNumber=null;
-            Map<String,Object> map = rmsCapacityMapper.getCapacityIdByCapacityNumber(capacityNumber);
-            if (map!=null) {
-              capacityId = DataChange.dataToBigDecimal(map.get("capacityId"));
-              bookingNumber =DataChange.dataToBigDecimal(map.get("bookingNumber"));
+            List<Map<String,Object>> mapList = rmsCapacityMapper.getCapacityIdByCapacityNumber(capacityNumber);
+            if (mapList!=null && mapList.size() != 0) {
+              capacityId = DataChange.dataToBigDecimal(mapList.get(0).get("capacityId"));
+              bookingNumber =DataChange.dataToBigDecimal(mapList.get(0).get("bookingNumber"));
             }
             BigDecimal capacityBookingNumber = DataChange.dataToBigDecimal(omsshipInstructionsCapacity.get("capacityBookingNumber"));
             if (capacityId != null) {

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

@@ -240,7 +240,7 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipLoadShipResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
         long resultLoadShipDate =(long) map.get("resultLoadShipDate");
         tmsshipLoadShipResult.setResultLoadShipDate(new Date(resultLoadShipDate));
-        tmsshipLoadShipResult.setResultActualInstallations(DataChange.dataToBigDecimal(map.get("resultActualInstallations")));
+        tmsshipLoadShipResult.setResultActualInstallations(new BigDecimal((String) map.get("resultActualInstallations")));
         long resultOutPortTime =(long) map.get("resultOutPortTime");
         tmsshipLoadShipResult.setResultOutPortTime(new Date(resultOutPortTime));
         long resultArrivalPortTime = (long) map.get("resultArrivalPortTime");

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

@@ -813,7 +813,7 @@
     select  RC.CAPACITY_ID "capacityId",
             RC.CAPACITY_BOOKING_NUMBER "bookingNumber"
     from RMS_CAPACITY RC
-    WHERE  rc.CAPACITY_NUMBER = #{capacityNumber} and RC.DELETED=0
+    WHERE  rc.CAPACITY_NUMBER = #{capacityNumber}
   </select>
 
 </mapper>