From 26fca05acab0ca04cae6cbc0faa0e2bebe22585e Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 10 Apr 2024 17:30:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/bus/impl/HiddenServiceImpl.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java index 65880571..1d7005cb 100644 --- a/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java +++ b/src/main/java/com/zcloud/service/bus/impl/HiddenServiceImpl.java @@ -731,8 +731,8 @@ public class HiddenServiceImpl implements HiddenService{ if(!Tools.isEmpty(zcbZcWc)){ map.put("zcbZcZg",zcbZcWc.size()); map.put("zcbZcWwcZg",zcbZc.size()-zcbZcWc.size()); - BigDecimal result = new BigDecimal(zcbZcWc.size()).divide(new BigDecimal(zcbZc.size()), 0, RoundingMode.HALF_UP); - map.put("zcbZcZgl",result+"%"); //整改率 + BigDecimal result = new BigDecimal(zcbZcWc.size()).divide(new BigDecimal(zcbZc.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + map.put("zcbZcZgl",result.intValue()+"%"); //整改率 }else { map.put("zcbZcZg","0"); map.put("zcbZcWwcZg",zcbZcWc.size()); @@ -755,8 +755,8 @@ public class HiddenServiceImpl implements HiddenService{ if(!Tools.isEmpty(xcbZcWc)){ map.put("xcbZcZg",xcbZcWc.size()); map.put("xcbZcWwcZg",xcbZc.size()-xcbZcWc.size()); - BigDecimal result = new BigDecimal(xcbZcWc.size()).divide(new BigDecimal(xcbZc.size()), 0, RoundingMode.HALF_UP); - map.put("xcbZcZgl",result+"%"); //整改率 + BigDecimal result = new BigDecimal(xcbZcWc.size()).divide(new BigDecimal(xcbZc.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + map.put("xcbZcZgl",result.intValue()+"%"); //整改率 }else { map.put("xcbZcZg","0"); map.put("xcbZcWwcZg",xcbZcWc.size()); @@ -779,8 +779,8 @@ public class HiddenServiceImpl implements HiddenService{ if(!Tools.isEmpty(bzbZcWc)){ map.put("bzbZcZg",bzbZcWc.size()); map.put("bzbZcWwcZg",bzbZc.size()-bzbZcWc.size()); - BigDecimal result = new BigDecimal(bzbZcWc.size()).divide(new BigDecimal(bzbZc.size()), 0, RoundingMode.HALF_UP); - map.put("bzbZcZgl",result+"%"); //整改率 + BigDecimal result = new BigDecimal(bzbZcWc.size()).divide(new BigDecimal(bzbZc.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + map.put("bzbZcZgl",result.intValue()+"%"); //整改率 }else { map.put("bzbZcZg","0"); map.put("bzbZcWwcZg",bzbZcWc.size()); @@ -807,8 +807,8 @@ public class HiddenServiceImpl implements HiddenService{ if(!Tools.isEmpty(zcbGscWc)){ map.put("zcbGscZg",zcbGscWc.size()); map.put("zcbGscWwcZg",zcbGsc.size()-zcbGscWc.size()); - BigDecimal result = new BigDecimal(zcbGscWc.size()).divide(new BigDecimal(zcbGsc.size()), 0, RoundingMode.HALF_UP); - map.put("zcbGscZgl",result+"%"); //整改率 + BigDecimal result = new BigDecimal(zcbGscWc.size()).divide(new BigDecimal(zcbGsc.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + map.put("zcbGscZgl",result.intValue()+"%"); //整改率 }else { map.put("zcbGscZg","0"); map.put("zcbGscWwcZg",zcbGscWc.size()); @@ -831,8 +831,8 @@ public class HiddenServiceImpl implements HiddenService{ if(!Tools.isEmpty(xcbGscWc)){ map.put("xcbGscZg",xcbGscWc.size()); map.put("xcbGscWwcZg",xcbGsc.size()-xcbGscWc.size()); - BigDecimal result = new BigDecimal(xcbGscWc.size()).divide(new BigDecimal(xcbGsc.size()), 0, RoundingMode.HALF_UP); - map.put("xcbGscZgl",result+"%"); //整改率 + BigDecimal result = new BigDecimal(xcbGscWc.size()).divide(new BigDecimal(xcbGsc.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + map.put("xcbGscZgl",result.intValue()+"%"); //整改率 }else { map.put("xcbGscZg","0"); map.put("xcbGscWwcZg",xcbGscWc.size()); @@ -855,8 +855,8 @@ public class HiddenServiceImpl implements HiddenService{ if(!Tools.isEmpty(bzbGscWc)){ map.put("bzbGscZg",bzbGscWc.size()); map.put("bzbGscWwcZg",bzbGsc.size()-bzbGscWc.size()); - BigDecimal result = new BigDecimal(bzbGscWc.size()).divide(new BigDecimal(bzbGsc.size()), 0, RoundingMode.HALF_UP); - map.put("bzbGscZgl",result+"%"); //整改率 + BigDecimal result = new BigDecimal(bzbGscWc.size()).divide(new BigDecimal(bzbGsc.size()), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + map.put("bzbGscZgl",result.intValue()+"%"); //整改率 }else { map.put("bzbGscZg","0"); map.put("bzbGscWwcZg",bzbGscWc.size()); @@ -878,8 +878,8 @@ public class HiddenServiceImpl implements HiddenService{ map.put("zcbHjZg",zcbHjZg); //整改数 map.put("zcbHjWwcZg",zcbHjZs-zcbHjZg); //整改未完成数 if(BigDecimal.ZERO.compareTo(new BigDecimal(zcbHjZs))<0 && BigDecimal.ZERO.compareTo(new BigDecimal(zcbHjZg))<0){ - BigDecimal zcbResult = new BigDecimal(zcbHjZg).divide(new BigDecimal(zcbHjZs), 0, RoundingMode.HALF_UP); - map.put("zcbHjZgl",zcbResult); //整改率 + BigDecimal zcbResult = new BigDecimal(zcbHjZg).divide(new BigDecimal(zcbHjZs), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + map.put("zcbHjZgl",zcbResult.intValue()+"%"); //整改率 }else { map.put("zcbHjZgl","100%"); //整改率 } @@ -892,8 +892,8 @@ public class HiddenServiceImpl implements HiddenService{ map.put("xcbHjZg",xcbHjZg); //整改数 map.put("xcbHjWwcZg",xcbHjZs-xcbHjZg); //整改未完成数 if(BigDecimal.ZERO.compareTo(new BigDecimal(xcbHjZg))<0 && BigDecimal.ZERO.compareTo(new BigDecimal(xcbHjZs))<0){ - BigDecimal xcbResult = new BigDecimal(xcbHjZg).divide(new BigDecimal(xcbHjZs), 0, RoundingMode.HALF_UP); - map.put("xcbHjZgl",xcbResult); //整改率 + BigDecimal xcbResult = new BigDecimal(xcbHjZg).divide(new BigDecimal(xcbHjZs), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + map.put("xcbHjZgl",xcbResult.intValue()+"%"); //整改率 }else { map.put("xcbHjZgl","100%"); //整改率 } @@ -906,8 +906,8 @@ public class HiddenServiceImpl implements HiddenService{ map.put("bzbHjZg",bzbHjZg); //整改数 map.put("bzbHjWwcZg",bzbHjZs-bzbHjZg); //整改未完成数 if(BigDecimal.ZERO.compareTo(new BigDecimal(bzbHjZg))<0 && BigDecimal.ZERO.compareTo(new BigDecimal(bzbHjZs))<0){ - BigDecimal bzbResult = new BigDecimal(bzbHjZg).divide(new BigDecimal(bzbHjZs), 0, RoundingMode.HALF_UP); - map.put("bzbHjZgl",bzbResult); //整改率 + BigDecimal bzbResult = new BigDecimal(bzbHjZg).divide(new BigDecimal(bzbHjZs), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100)); + map.put("bzbHjZgl",bzbResult.intValue()+"%"); //整改率 }else { map.put("bzbHjZgl","100%"); //整改率 }