diff --git a/src/main/java/cn/palmte/work/service/ProjectSummaryService.java b/src/main/java/cn/palmte/work/service/ProjectSummaryService.java index 8e3879c..cd9b174 100644 --- a/src/main/java/cn/palmte/work/service/ProjectSummaryService.java +++ b/src/main/java/cn/palmte/work/service/ProjectSummaryService.java @@ -53,7 +53,7 @@ public class ProjectSummaryService { List<Project> projects = new ArrayList<>(); List<Integer> projectInt = new ArrayList<>(); for (Project project : projectList) { - if (project.getApproveStatusBudget() == 2) { + if (project.getApproveStatusSettle() == 2) { projects.add(project); projectInt.add(project.getId()); continue; @@ -177,7 +177,8 @@ public class ProjectSummaryService { private void setProfitMargin(SettleBean monthSettle) { BigDecimal divide2 = monthSettle.getIncomeTotal(); - if (divide2.equals(new BigDecimal(0))) { + BigDecimal min = new BigDecimal(0.01); + if (divide2.compareTo(min) < 0) { divide2 = new BigDecimal(1); } monthSettle.setGrossProfitProfitMargin(monthSettle.getGrossProfit().multiply(new BigDecimal(100).divide(divide2, BigDecimal.ROUND_HALF_UP)));