|
|
@@ -137,8 +137,8 @@ public class IotRepairController {
|
|
|
// 查询保养费用
|
|
|
Map<String, Object> byMap = new HashMap<>();
|
|
|
byMap.put("total", byFee);
|
|
|
- byMap.put("hb", hbByFee==null|| hbByFee.equals(BigDecimal.ZERO) ? hbByFee :((byFee.subtract(hbByFee)).divide(hbByFee,2, RoundingMode.HALF_UP)));
|
|
|
- byMap.put("tb", tbByFee==null||tbByFee.equals(BigDecimal.ZERO)?tbByFee:((byFee.subtract(tbByFee)).divide(tbByFee,2, RoundingMode.HALF_UP)));
|
|
|
+ byMap.put("hb", hbByFee == null || (hbByFee.compareTo(BigDecimal.ZERO)==0) ? hbByFee :((byFee.subtract(hbByFee)).divide(hbByFee,2, RoundingMode.HALF_UP)));
|
|
|
+ byMap.put("tb", tbByFee==null||(tbByFee.compareTo(BigDecimal.ZERO)==0)?tbByFee:((byFee.subtract(tbByFee)).divide(tbByFee,2, RoundingMode.HALF_UP)));
|
|
|
|
|
|
Map<String, Object> totalMap = new HashMap<>();
|
|
|
totalMap.put("total", totalFee);
|