| @@ -404,8 +404,8 @@ public class DataTowerServiceImpl implements DataTowerService { | |||||
| double dczl = new BigDecimal(yczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); | double dczl = new BigDecimal(yczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); | ||||
| double wczld = ((double) wczsize / size) * 100; | double wczld = ((double) wczsize / size) * 100; | ||||
| double wczl = new BigDecimal(wczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); | double wczl = new BigDecimal(wczld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); | ||||
| datamap.put("yczl", dczl + "%"); | |||||
| datamap.put("wczl", wczl + "%"); | |||||
| datamap.put("yczl", dczl); | |||||
| datamap.put("wczl", wczl); | |||||
| } | } | ||||
| //租金 | //租金 | ||||
| @@ -430,7 +430,7 @@ public class DataTowerServiceImpl implements DataTowerService { | |||||
| double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | double zjcjl = divide.multiply(new BigDecimal(100)).doubleValue(); | ||||
| datamap.put("ysje", receivepay); | datamap.put("ysje", receivepay); | ||||
| datamap.put("ssje", pay); | datamap.put("ssje", pay); | ||||
| datamap.put("zjsjl", zjcjl + "%"); | |||||
| datamap.put("zjsjl", zjcjl); | |||||
| } else { | } else { | ||||
| datamap.put("ysje", 0); | datamap.put("ysje", 0); | ||||
| datamap.put("ssje", 0); | datamap.put("ssje", 0); | ||||
| @@ -458,7 +458,7 @@ public class DataTowerServiceImpl implements DataTowerService { | |||||
| if (merchantsize > 0 && tradesize > 0) { | if (merchantsize > 0 && tradesize > 0) { | ||||
| double shsbld = ((double) tradesize / merchantsize) * 100; | double shsbld = ((double) tradesize / merchantsize) * 100; | ||||
| double shsbl = new BigDecimal(shsbld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); | double shsbl = new BigDecimal(shsbld).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); | ||||
| datamap.put("shsbl", shsbl + "%"); | |||||
| datamap.put("shsbl", shsbl); | |||||
| } else { | } else { | ||||
| datamap.put("shsbl", 0); | datamap.put("shsbl", 0); | ||||
| } | } | ||||