From 418ba023f3b6b24d15503ca48e1e1c2c7383d98b Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Thu, 5 Jan 2023 11:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9E=AB=E8=B5=84=20?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/controller/backend/ProcessController.java     | 10 +++++-----
 .../cn/palmte/work/service/ProjectProcessService.java  |  9 ++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 6cab5bb..11ea8c5 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -189,8 +189,8 @@ public class ProcessController {
     model.addAttribute("cooperationType", Enumerable.of(CooperationType.class, project.getCooperateType()).getDescription());
     List<ProcessAttachment> attachments = JSONArray.parseArray(process.getAttachmentUri(), ProcessAttachment.class);
     model.addAttribute("attachments", attachments);
-    model.addAttribute("isPrepaid", isPrepaid(project));
     BigDecimal repaidAmount = getRepaidAmount(process.getProjectId());
+    model.addAttribute("isPrepaid", isPrepaid(repaidAmount));
     model.addAttribute("repaidAmount", repaidAmount);
 
     if (isAdministrator(getLoginUser())) {
@@ -324,7 +324,7 @@ public class ProcessController {
     BudgetBean budgetBean = projectBudgetService.getBudget(project);
 
     return ProjectReturnValue.builder()
-            .isPrepaid(isPrepaid(project))
+            .isPrepaid(isPrepaid(repaidAmount))
             .projectId(project.getId())
             .incomeDetails(incomeDetails)
             .procurementDetails(procurementDetails)
@@ -340,8 +340,8 @@ public class ProcessController {
             .build();
   }
 
-  private String isPrepaid(Project project) {
-    return processService.isProjectPrepaid(project) ? "是" : "否";
+  private String isPrepaid(BigDecimal repaidAmount) {
+    return processService.isProjectPrepaid(repaidAmount) ? "是" : "否";
   }
 
   /**
@@ -378,7 +378,7 @@ public class ProcessController {
       procurementDetails = processService.getProcurementDetails(project.getId(), id);
     }
 
-    detail.setIsPrepaid(isPrepaid(project));
+    detail.setIsPrepaid(isPrepaid(repaidAmount));
     detail.setContract(contract);
     detail.setIncomeDetails(incomeDetails);
     detail.setSupplierMaterials(supplierMaterials);
diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java
index b781155..d3d521a 100644
--- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java
@@ -456,7 +456,14 @@ public class ProjectProcessService {
    * 是否垫资
    */
   public boolean isProjectPrepaid(Project project) {
-    return project.getUnderwrittenMode() == 2 || project.getUnderwrittenMode() == 3;
+    return BigDecimal.ZERO.equals(getProjectRepaidAmount(project.getId()));
+  }
+
+  /**
+   * 是否垫资
+   */
+  public boolean isProjectPrepaid(BigDecimal repaidAmount) {
+    return BigDecimal.ZERO.equals(repaidAmount);
   }
 
   /**