From f49921817cd2b9cf981dbf931276cf0cb02ff078 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Mon, 6 Dec 2021 16:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E7=B2=BE=E7=A1=AE=E5=88=B0=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/controller/backend/ProjectController.java   | 2 +-
 src/main/resources/templates/admin/project_approve.ftl      | 6 +++---
 .../resources/templates/admin/project_estimate_edit.ftl     | 4 ++--
 3 files changed, 6 insertions(+), 6 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 75cfd0d..5467d2b 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -521,6 +521,6 @@ public class ProjectController extends BaseController {
 
     @InitBinder
     public void initBinder(WebDataBinder webDataBinder) {
-        webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM"));
+        webDataBinder.addCustomFormatter(new DateFormatter("yyyy-MM-dd"));
     }
 }
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 3c0fa01..f693cf9 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -131,14 +131,14 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <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">
-                                    <span>${project.startDate?string("yyyy-MM")}</span>
+                                    <span>${project.startDate?string("yyyy-MM-dd")}</span>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
                                 <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">
-                                    <span>${project.endDate?string("yyyy-MM")}</span>
+                                    <span>${project.endDate?string("yyyy-MM-dd")}</span>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -1128,7 +1128,7 @@
                                     <td>合计</td>
                                     <td></td>
                                     <td></td>
-                                    <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getIncomeTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
+                                    <td><input name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
                                     <td><input name="costTotalTaxExclude" value="${Utils.format(budgetBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
                                     <td><input name="costSettleTotal" value="${Utils.format(currentBean.getCostTotalTaxExclude(),'0')}" type="number" readonly required title="此列累计"></td>
                                     <td><input name="costFinalTotal" type="number" value="${Utils.format(finalBean.getCostTotal(),'0')}" readonly required title="此列累计"></td>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 0ca82fa..056d28f 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -42,7 +42,7 @@
                             <i class="am-icon-calendar"></i>
                             <input type="text" class="am-form-field am-input-sm" id="startDate"
                                    name="startDate" autocomplete="off"
-                                   value="${project.startDate?string("yyyy-MM")}" placeholder="项目计划开始时间"
+                                   value="${project.startDate?string("yyyy-MM-dd")}" placeholder="项目计划开始时间"
                                    data-am-datepicker>
                         </div>
                     </div>
@@ -55,7 +55,7 @@
                             <i class="am-icon-calendar"></i>
                             <input type="text" class="am-form-field am-input-sm" id="endDate"
                                    name="endDate" autocomplete="off"
-                                   value="${project.endDate?string("yyyy-MM")}" placeholder="项目计划结束时间"
+                                   value="${project.endDate?string("yyyy-MM-dd")}" placeholder="项目计划结束时间"
                                    data-am-datepicker>
                         </div>
                     </div>