|
|
@@ -258,17 +258,17 @@ public class ConsumeServicelmpl extends ServiceImpl<ConsumeMapper, Consume> impl
|
|
|
|
|
|
Double total = consumeMoney + hotWaterMoney + coldWaterAndElectricityMoney;
|
|
|
if (total > 0) {
|
|
|
- if (consumeMoney == 0) {
|
|
|
- personConsumDto.setPercentage(0 + "%");
|
|
|
- }
|
|
|
BigDecimal b = new BigDecimal(consumeMoney / total);
|
|
|
double f1 = b.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
|
|
|
- Double v = f1 * 100;
|
|
|
+ BigDecimal bd6 = new BigDecimal(Double.toString(100));
|
|
|
+ BigDecimal bd4 = new BigDecimal(Double.toString(f1));
|
|
|
+ double v = bd6.multiply(bd4).doubleValue();
|
|
|
personConsumDto.setPercentage(v + "%");
|
|
|
|
|
|
BigDecimal b1 = new BigDecimal(hotWaterMoney / total);
|
|
|
double f2 = b1.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
|
|
|
- Double v1 = f2 * 100;
|
|
|
+ BigDecimal bd5 = new BigDecimal(Double.toString(f2));
|
|
|
+ double v1 = bd6.multiply(bd5).doubleValue();
|
|
|
String p = "";
|
|
|
if (v1 > 100 - v || coldWaterAndElectricityMoney == 0) {
|
|
|
BigDecimal bd1 = new BigDecimal(Double.toString(100));
|