From fef4b2220f70143fc2d7c375f2e03a034e602165 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 19 Nov 2021 15:50:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B1=87=E6=80=BB=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=AF=E8=A7=81=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/palmte/work/service/ProjectSummaryService.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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)));