|
@@ -358,13 +358,18 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
|
|
|
BigDecimal type = DataChange.dataToBigDecimal(map.get("type"));
|
|
|
|
|
|
List<Map<String, Object>> PriceValueList = new ArrayList<>();
|
|
|
- if (type.compareTo(new BigDecimal(1)) == 0) {
|
|
|
- PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId);
|
|
|
- }else if(type.compareTo(new BigDecimal(2)) == 0) {
|
|
|
- PriceValueList = amsContractTruckPriceMapper.getPriceValueListInward(oilTypeId);
|
|
|
- }
|
|
|
-
|
|
|
+ PriceValueList = amsContractTruckPriceMapper.getPriceValueList(oilTypeId);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
for (Map<String, Object> stringObjectMap : PriceValueList) {
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
if (stringObjectMap.get("haulDistance")!=null) {
|
|
|
|