| @@ -2317,11 +2317,11 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); | BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); | ||||
| BigDecimal pay = (BigDecimal) payinfo.get("pay"); | BigDecimal pay = (BigDecimal) payinfo.get("pay"); | ||||
| if (receivepay.doubleValue() > 0) { | if (receivepay.doubleValue() > 0) { | ||||
| BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); | |||||
| double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | ||||
| datamap.put("rentysje", receivepay); | datamap.put("rentysje", receivepay); | ||||
| datamap.put("rentssje", pay); | datamap.put("rentssje", pay); | ||||
| datamap.put("rentzjsjl", zjcjl); | |||||
| datamap.put("rentzjsjl", (double) Math.round(zjcjl * 100) / 100); | |||||
| } else { | } else { | ||||
| datamap.put("rentysje", 0); | datamap.put("rentysje", 0); | ||||
| datamap.put("rentssje", 0); | datamap.put("rentssje", 0); | ||||
| @@ -2339,11 +2339,11 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); | BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); | ||||
| BigDecimal pay = (BigDecimal) payinfo.get("pay"); | BigDecimal pay = (BigDecimal) payinfo.get("pay"); | ||||
| if (receivepay.doubleValue() > 0) { | if (receivepay.doubleValue() > 0) { | ||||
| BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); | |||||
| double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | ||||
| datamap.put("propertyysje", receivepay); | datamap.put("propertyysje", receivepay); | ||||
| datamap.put("propertyssje", pay); | datamap.put("propertyssje", pay); | ||||
| datamap.put("propertyzjsjl", zjcjl); | |||||
| datamap.put("propertyzjsjl", (double) Math.round(zjcjl * 100) / 100); | |||||
| } else { | } else { | ||||
| datamap.put("propertyysje", 0); | datamap.put("propertyysje", 0); | ||||
| datamap.put("propertyssje", 0); | datamap.put("propertyssje", 0); | ||||
| @@ -2361,11 +2361,11 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); | BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); | ||||
| BigDecimal pay = (BigDecimal) payinfo.get("pay"); | BigDecimal pay = (BigDecimal) payinfo.get("pay"); | ||||
| if (receivepay.doubleValue() > 0) { | if (receivepay.doubleValue() > 0) { | ||||
| BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); | |||||
| double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | ||||
| datamap.put("depositysje", receivepay); | datamap.put("depositysje", receivepay); | ||||
| datamap.put("depositssje", pay); | datamap.put("depositssje", pay); | ||||
| datamap.put("depositzjsjl", zjcjl); | |||||
| datamap.put("depositzjsjl", (double) Math.round(zjcjl * 100) / 100); | |||||
| } else { | } else { | ||||
| datamap.put("depositysje", 0); | datamap.put("depositysje", 0); | ||||
| datamap.put("depositssje", 0); | datamap.put("depositssje", 0); | ||||
| @@ -2383,11 +2383,11 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); | BigDecimal receivepay = (BigDecimal) payinfo.get("receivepay"); | ||||
| BigDecimal pay = (BigDecimal) payinfo.get("pay"); | BigDecimal pay = (BigDecimal) payinfo.get("pay"); | ||||
| if (receivepay.doubleValue() > 0) { | if (receivepay.doubleValue() > 0) { | ||||
| BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_HALF_UP); | |||||
| BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_HALF_UP); | |||||
| double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | ||||
| datamap.put("otherysje", receivepay); | datamap.put("otherysje", receivepay); | ||||
| datamap.put("otherssje", pay); | datamap.put("otherssje", pay); | ||||
| datamap.put("otherzjsjl", zjcjl); | |||||
| datamap.put("otherzjsjl", (double) Math.round(zjcjl * 100) / 100); | |||||
| } else { | } else { | ||||
| datamap.put("otherysje", 0); | datamap.put("otherysje", 0); | ||||
| datamap.put("otherssje", 0); | datamap.put("otherssje", 0); | ||||
| @@ -2465,10 +2465,14 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| public static void main(String[] args) { | public static void main(String[] args) { | ||||
| BigDecimal receivepay = new BigDecimal(33); | BigDecimal receivepay = new BigDecimal(33); | ||||
| BigDecimal pay = new BigDecimal(11); | BigDecimal pay = new BigDecimal(11); | ||||
| BigDecimal divide = pay.divide(receivepay, 2, BigDecimal.ROUND_UNNECESSARY); | |||||
| BigDecimal divide = pay.divide(receivepay, 8, BigDecimal.ROUND_UP); | |||||
| System.out.println(divide); | System.out.println(divide); | ||||
| double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | ||||
| System.out.println(zjcjl); | System.out.println(zjcjl); | ||||
| double d = 114.336; | |||||
| d = (double) Math.round(d * 100) / 100; | |||||
| System.out.println(d); | |||||
| } | } | ||||
| /** | /** | ||||