Merge remote-tracking branch 'origin/master'

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

@@ -45,10 +45,10 @@ public class BmsshipContractPriceServiceImpl  implements IBmsshipContractPriceSe
         String contractNo =(String) mapValue.get("contractNo");
         BigDecimal portId=DataChange.dataToBigDecimal(mapValue.get("portId"));
         //判断是否存在相同的合同号
-        BigDecimal conpareNo = bmsshipContractPriceMapper.contractNoCompare(contractNo);
-        if (conpareNo!=null){
-            return  -1;
-        }
+//        BigDecimal conpareNo = bmsshipContractPriceMapper.contractNoCompare(contractNo);
+//        if (conpareNo!=null){
+//            return  -1;
+//        }
         BigDecimal unitPrice = DataChange.dataToBigDecimal(mapValue.get("unitPrice"));
         long startTime =(long) mapValue.get("startTime");
         long endTime = (long) mapValue.get("endTime");
@@ -87,10 +87,10 @@ public class BmsshipContractPriceServiceImpl  implements IBmsshipContractPriceSe
         String contractNo =(String) mapValue.get("contractNo");
         BigDecimal portId=DataChange.dataToBigDecimal(mapValue.get("portId"));
         //判断是否存在相同的合同号
-        BigDecimal conpareNo = bmsshipContractPriceMapper.contractNoCompare(contractNo);
-        if (conpareNo!=null&&!conpareNo.equals(resultId)){
-            return  -1;
-        }
+//        BigDecimal conpareNo = bmsshipContractPriceMapper.contractNoCompare(contractNo);
+//        if (conpareNo!=null&&!conpareNo.equals(resultId)){
+//            return  -1;
+//        }
         BigDecimal unitPrice = DataChange.dataToBigDecimal(mapValue.get("unitPrice"));
         long startTime =(long) mapValue.get("startTime");
         long endTime = (long) mapValue.get("endTime");
@@ -127,6 +127,7 @@ public class BmsshipContractPriceServiceImpl  implements IBmsshipContractPriceSe
         return bmsshipContractPriceMapper.updateByPrimaryKeySelective(bmsshipContractPrice);
     }
 
+    //查询水运单条
     @Override
     public List<Map<String, Object>> selectBmsshipPriceList(BigDecimal id) {
         return bmsshipContractPriceMapper.selectBmsshipPriceList(id);

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

@@ -457,7 +457,8 @@
     BCP.START_TIME "startTime",
     BCP.END_TIME "endTime",
     BCP.UNIT_PRICE "unitPrice",
-    RP.PORT_NAME "portName"
+    RP.PORT_NAME "portName",
+    BCP.PORT_ID "portId"
     from BMSSHIP_CONTRACT_PRICE BCP
     left join RMS_PORT RP
     on BCP.PORT_ID=RP.PORT_ID