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

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

@@ -37,7 +37,7 @@ public interface AmsContractTruckPriceMapper extends IBaseMapper<AmsContractTran
     //通过主键查询参考运距
     BigDecimal getLinePathLength(BigDecimal lineId);
     //获取符合条件运价数值列表
-    List<Map<String, Object>> getPriceValueList(BigDecimal oilTypeId,BigDecimal type);
+    List<Map<String, Object>> getPriceValueList(BigDecimal oilTypeId);
     //获取运价和吨公里数值列表
     List<Map<String, Object>> getPriceValueAndPriceTonKilometer();
     //通过主键修改吨公里数

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

@@ -216,7 +216,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         BigDecimal newOilPrice = DataChange.dataToBigDecimal(map.get("newOilPrice"));
         BigDecimal type = new BigDecimal(1);
         //根据油品名称ID和非历史油价筛选出符合条件的运价合集
-        List<Map<String, Object>> PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId,type);
+        List<Map<String, Object>> PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId);
         for (Map<String, Object> stringObjectMap : PriceValueList) {
             stringObjectMap.put("priceDate",map.get("priceDate"));
             //获取该条单价的原油价基准