diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OverallEfficiencyAnalysisServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OverallEfficiencyAnalysisServiceImpl.java index 4f09af7..2b1388b 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OverallEfficiencyAnalysisServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/OverallEfficiencyAnalysisServiceImpl.java @@ -100,8 +100,8 @@ public class OverallEfficiencyAnalysisServiceImpl implements OverallEfficiencyAn if(StringUtils.isEmpty(overallEfficiencyCost) || StringUtils.isEmpty(overallEfficiencyCost2)){ res.put("缩减成本",BigDecimal.ZERO); }else { - BigDecimal difference = overallEfficiencyCost2.getDataMoney().subtract(overallEfficiencyCost.getDataMoney()); // B - A - BigDecimal ratio = difference.divide(overallEfficiencyCost.getDataMoney(), 2, RoundingMode.HALF_UP); // 除法,保留scale位小数,四舍五入 + BigDecimal difference = overallEfficiencyCost.getDataMoney().subtract(overallEfficiencyCost2.getDataMoney()); // B - A + BigDecimal ratio = difference.multiply(BigDecimal.valueOf(100)).divide(overallEfficiencyCost.getDataMoney(), 2, RoundingMode.HALF_UP); // 除法,保留scale位小数,四舍五入 res.put("缩减成本",ratio+"%"); } return AjaxResult.success(res); diff --git a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectDataServiceImpl.java b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectDataServiceImpl.java index 1524465..58e9e92 100644 --- a/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectDataServiceImpl.java +++ b/securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/ProjectDataServiceImpl.java @@ -90,7 +90,7 @@ public class ProjectDataServiceImpl implements ProjectDataService { //项目风险 List projectSafetyDataList2 = projectDataMapper.getSafety(projectData); countNum=0; - for (ProjectData projectDataNew:projectSafetyDataList) { + for (ProjectData projectDataNew:projectSafetyDataList2) { countNum = countNum + projectDataNew.getNum(); } ProjectData projectDataCountNum = new ProjectData();