修改一览表单价精度
This commit is contained in:
@ -189,7 +189,7 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl<BusBiddingLimitL
|
|||||||
listVoList.stream().filter(vo -> vo.getUnitPrice() != null && vo.getUnitPrice().compareTo(BigDecimal.ZERO) != 0)
|
listVoList.stream().filter(vo -> vo.getUnitPrice() != null && vo.getUnitPrice().compareTo(BigDecimal.ZERO) != 0)
|
||||||
.filter(vo -> vo.getQuantity() != null && vo.getQuantity().compareTo(BigDecimal.ZERO) != 0)
|
.filter(vo -> vo.getQuantity() != null && vo.getQuantity().compareTo(BigDecimal.ZERO) != 0)
|
||||||
.forEach(item -> {
|
.forEach(item -> {
|
||||||
item.setPrice(item.getUnitPrice().multiply(item.getQuantity()).setScale(2, RoundingMode.HALF_UP));
|
item.setPrice(item.getUnitPrice().multiply(item.getQuantity()).setScale(4, RoundingMode.HALF_UP));
|
||||||
});
|
});
|
||||||
|
|
||||||
//构建父子映射
|
//构建父子映射
|
||||||
@ -230,7 +230,7 @@ public class BusBiddingLimitListServiceImpl extends ServiceImpl<BusBiddingLimitL
|
|||||||
BigDecimal totalPrice = node.getChildren().stream()
|
BigDecimal totalPrice = node.getChildren().stream()
|
||||||
.map(BusBiddingLimitListVo::getPrice)
|
.map(BusBiddingLimitListVo::getPrice)
|
||||||
.reduce(BigDecimal.ZERO, BigDecimal::add)
|
.reduce(BigDecimal.ZERO, BigDecimal::add)
|
||||||
.setScale(2, RoundingMode.HALF_UP);
|
.setScale(4, RoundingMode.HALF_UP);
|
||||||
node.setPrice(totalPrice);
|
node.setPrice(totalPrice);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -154,7 +154,7 @@ public class BusBiddingPlanServiceImpl extends ServiceImpl<BusBiddingPlanMapper,
|
|||||||
throw new ServiceException(busBillofquantitiesLimitListVo.getName()+"数量超过了总数量");
|
throw new ServiceException(busBillofquantitiesLimitListVo.getName()+"数量超过了总数量");
|
||||||
}
|
}
|
||||||
if (busBillofquantitiesLimitListVo.getUnitPrice() != null && limitListBo.getNum() != null){
|
if (busBillofquantitiesLimitListVo.getUnitPrice() != null && limitListBo.getNum() != null){
|
||||||
price = price.add(busBillofquantitiesLimitListVo.getUnitPrice().multiply(limitListBo.getNum()).setScale(2, RoundingMode.HALF_UP));
|
price = price.add(busBillofquantitiesLimitListVo.getUnitPrice().multiply(limitListBo.getNum()).setScale(4, RoundingMode.HALF_UP));
|
||||||
}
|
}
|
||||||
busTenderPlanningLimitList.setNum(limitListBo.getNum());
|
busTenderPlanningLimitList.setNum(limitListBo.getNum());
|
||||||
planningLimitListList.add(busTenderPlanningLimitList);
|
planningLimitListList.add(busTenderPlanningLimitList);
|
||||||
@ -251,7 +251,7 @@ public class BusBiddingPlanServiceImpl extends ServiceImpl<BusBiddingPlanMapper,
|
|||||||
if (limitList.getId().equals(limitList1.getLimitListId())){
|
if (limitList.getId().equals(limitList1.getLimitListId())){
|
||||||
limitList.setQuantity(limitList1.getNum());
|
limitList.setQuantity(limitList1.getNum());
|
||||||
if (limitList.getUnitPrice() != null && limitList.getQuantity() != null) {
|
if (limitList.getUnitPrice() != null && limitList.getQuantity() != null) {
|
||||||
limitList.setPrice(limitList.getUnitPrice().multiply(limitList.getQuantity()).setScale(2, RoundingMode.HALF_UP));
|
limitList.setPrice(limitList.getUnitPrice().multiply(limitList.getQuantity()).setScale(4, RoundingMode.HALF_UP));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -201,7 +201,7 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl<BusBill
|
|||||||
listVoList.stream().filter(vo -> vo.getUnitPrice() != null && vo.getUnitPrice().compareTo(BigDecimal.ZERO) != 0)
|
listVoList.stream().filter(vo -> vo.getUnitPrice() != null && vo.getUnitPrice().compareTo(BigDecimal.ZERO) != 0)
|
||||||
.filter(vo -> vo.getQuantity() != null && vo.getQuantity().compareTo(BigDecimal.ZERO) != 0)
|
.filter(vo -> vo.getQuantity() != null && vo.getQuantity().compareTo(BigDecimal.ZERO) != 0)
|
||||||
.forEach(item -> {
|
.forEach(item -> {
|
||||||
item.setPrice(item.getUnitPrice().multiply(item.getQuantity()).setScale(2, RoundingMode.HALF_UP));
|
item.setPrice(item.getUnitPrice().multiply(item.getQuantity()).setScale(4, RoundingMode.HALF_UP));
|
||||||
});
|
});
|
||||||
if (bo.getType().equals(LimitListTypeEnum.SPECIAL.getCode())) {
|
if (bo.getType().equals(LimitListTypeEnum.SPECIAL.getCode())) {
|
||||||
return listVoList;
|
return listVoList;
|
||||||
@ -371,7 +371,7 @@ public class BusBillofquantitiesLimitListServiceImpl extends ServiceImpl<BusBill
|
|||||||
BigDecimal totalPrice = node.getChildren().stream()
|
BigDecimal totalPrice = node.getChildren().stream()
|
||||||
.map(BusBillofquantitiesLimitListVo::getPrice)
|
.map(BusBillofquantitiesLimitListVo::getPrice)
|
||||||
.reduce(BigDecimal.ZERO, BigDecimal::add)
|
.reduce(BigDecimal.ZERO, BigDecimal::add)
|
||||||
.setScale(2, RoundingMode.HALF_UP);
|
.setScale(4, RoundingMode.HALF_UP);
|
||||||
node.setPrice(totalPrice);
|
node.setPrice(totalPrice);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -130,7 +130,7 @@ public class BusSegmentedIndicatorPlanningServiceImpl extends ServiceImpl<BusSeg
|
|||||||
planningLimitListList.add(busIndicatorPlanningLimitList);
|
planningLimitListList.add(busIndicatorPlanningLimitList);
|
||||||
getPidVO(busBillofquantitiesLimitListVo.getPid(),planningLimitListList,bo.getId());
|
getPidVO(busBillofquantitiesLimitListVo.getPid(),planningLimitListList,bo.getId());
|
||||||
if (busBillofquantitiesLimitListVo.getUnitPrice() != null && limitListBo.getNum() != null){
|
if (busBillofquantitiesLimitListVo.getUnitPrice() != null && limitListBo.getNum() != null){
|
||||||
price = price.add(busBillofquantitiesLimitListVo.getUnitPrice().multiply(limitListBo.getNum()).setScale(2, RoundingMode.HALF_UP));
|
price = price.add(busBillofquantitiesLimitListVo.getUnitPrice().multiply(limitListBo.getNum()).setScale(4, RoundingMode.HALF_UP));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
add.setPrice(price);
|
add.setPrice(price);
|
||||||
@ -246,7 +246,7 @@ public class BusSegmentedIndicatorPlanningServiceImpl extends ServiceImpl<BusSeg
|
|||||||
if (limitList.getId().equals(limitList1.getLimitListId())){
|
if (limitList.getId().equals(limitList1.getLimitListId())){
|
||||||
limitList.setQuantity(limitList1.getNum());
|
limitList.setQuantity(limitList1.getNum());
|
||||||
if (limitList.getUnitPrice() != null && limitList.getQuantity() != null) {
|
if (limitList.getUnitPrice() != null && limitList.getQuantity() != null) {
|
||||||
limitList.setPrice(limitList.getUnitPrice().multiply(limitList.getQuantity()).setScale(2, RoundingMode.HALF_UP));
|
limitList.setPrice(limitList.getUnitPrice().multiply(limitList.getQuantity()).setScale(4, RoundingMode.HALF_UP));
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user