From 5165ee7bddb41912992f0fed99f617fdea38c227 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 30 Dec 2021 15:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProjectController.java |  3 +-
 .../java/cn/palmte/work/model/Project.java    | 36 ++++++-------------
 .../palmte/work/service/ProjectService.java   |  2 --
 .../templates/admin/project_budget_edit.ftl   |  6 ++--
 4 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
index 4b19265..93e8694 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.datetime.DateFormatter;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 
@@ -212,7 +213,7 @@ public class ProjectController extends BaseController {
      * 进行项目预算保存
      */
     @RequestMapping("/budgetEditSave")
-    public String budgetEditSave(Project project, BudgetBean budgetBean, Map<String, Object> model) {
+    public String budgetEditSave(Project project, BindingResult bindingResult, BudgetBean budgetBean, Map<String, Object> model) {
         Project projectInDb = projectService.getProject(project.getId());
         projectBudgetService.budgetEditSave(project, projectInDb, budgetBean, InterfaceUtil.getAdmin(), ApproveStatusEnum.APPROVAL_UNCOMMIT);
         return "redirect:/project/list";
diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java
index 3702164..f1d361c 100644
--- a/src/main/java/cn/palmte/work/model/Project.java
+++ b/src/main/java/cn/palmte/work/model/Project.java
@@ -99,16 +99,16 @@ public class Project {
      */
     @Column(name = "terminal_customer")
     private String terminalCustomer;
-    /**
-     * 垫资利息（元为单位）
-     */
-    @Column(name = "advance_interest_amount")
-    private BigDecimal advanceInterestAmount;
-    /**
-     * 垫资峰值
-     */
-    @Column(name = "advance_peak_amount")
-    private BigDecimal advancePeakAmount;
+//    /**
+//     * 垫资利息（元为单位）
+//     */
+//    @Column(name = "advance_interest_amount")
+//    private BigDecimal advanceInterestAmount;
+//    /**
+//     * 垫资峰值
+//     */
+//    @Column(name = "advance_peak_amount")
+//    private BigDecimal advancePeakAmount;
     /**
      * 合同金额
      */
@@ -320,22 +320,6 @@ public class Project {
         this.terminalCustomer = terminalCustomer;
     }
 
-    public BigDecimal getAdvanceInterestAmount() {
-        return advanceInterestAmount;
-    }
-
-    public void setAdvanceInterestAmount(BigDecimal advanceInterestAmount) {
-        this.advanceInterestAmount = advanceInterestAmount;
-    }
-
-    public BigDecimal getAdvancePeakAmount() {
-        return advancePeakAmount;
-    }
-
-    public void setAdvancePeakAmount(BigDecimal advancePeakAmount) {
-        this.advancePeakAmount = advancePeakAmount;
-    }
-
     public BigDecimal getContractAmount() {
         return contractAmount;
     }
diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index b10e395..d04fc07 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -183,8 +183,6 @@ public class ProjectService {
         //只有如下可以修改
         projectInDb.setStartDate(project.getStartDate());
         projectInDb.setEndDate(project.getEndDate());
-        projectInDb.setAdvanceInterestAmount(project.getAdvanceInterestAmount());
-        projectInDb.setAdvancePeakAmount(project.getAdvancePeakAmount());
         projectInDb.setContractAmount(project.getContractAmount());
         projectInDb.setHuazhiProductAmount(project.getHuazhiProductAmount());
         projectInDb.setZiguangOtherAmount(project.getZiguangOtherAmount());
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 2eaf40e..1cd0ac2 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -32,7 +32,7 @@
             <div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">项目预算表</strong> / <small>${project.name}</small></div>
         </div>
 
-<form method="post" class="am-form" id="pmsForm" action="${base}/project/budgetEditSave" data-am-validator>
+<form method="post" class="am-form" id="pmsForm" action="${base}/project/budgetEditSave">
     <!--选项卡（tabs）begin-->
     <div class="am-tabs am-margin" data-am-tabs>
         <ul class="am-tabs-nav am-nav am-nav-tabs">
@@ -96,7 +96,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目类型</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入项目项目类型"
-                               name="type" <#if project.type=1>value="工程集成类"<#elseif project.type=2>value="设备集成类"<#else>value="战略合作类"</#if>
+                               name="typeName" <#if project.type=1>value="工程集成类"<#elseif project.type=2>value="设备集成类"<#else>value="战略合作类"</#if>
                                required readonly/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -105,7 +105,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资模式</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入垫资模式"
-                               name="underwrittenMode" required readonly
+                               name="underwrittenModeName" required readonly
                                <#if project.underwrittenMode=1>value="A类-不垫资（战略合作）"<#elseif project.underwrittenMode=2>value="B类-不垫资（背靠背）"
                                <#elseif project.underwrittenMode=3>value="C类-垫资（账期覆盖）"<#else>value="D类-垫资（账期不覆盖）"</#if> />
                     </div>