From d00e6d654d62e03b24f9a46700367224b81ac80d Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Wed, 1 Dec 2021 18:47:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=92=8C=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/controller/backend/ProjectController.java | 2 +-
 src/main/java/cn/palmte/work/model/Project.java           | 8 ++++++++
 .../resources/templates/admin/project_estimate_edit.ftl   | 4 ++--
 3 files changed, 11 insertions(+), 3 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 758ea66..9dad8e4 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -97,7 +97,7 @@ public class ProjectController extends BaseController {
         Map<String, String> searchInfo = getSearchInfo(keywords);
         downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream");
         String[] headers = {"项目名称", "项目类型", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"};
-        String[] exportColumns = {"name", "typeDesc", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate", "endDate", "lastUpdateTime"};
+        String[] exportColumns = {"name", "typeDesc", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDateYM", "endDateYM", "lastUpdateTime"};
         ExportUtils.exportToExcel(headers, exportColumns, 1, 10000,
                 httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, pN, pS).getList());
     }
diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java
index 7d47e7c..296777c 100644
--- a/src/main/java/cn/palmte/work/model/Project.java
+++ b/src/main/java/cn/palmte/work/model/Project.java
@@ -2,6 +2,7 @@ package cn.palmte.work.model;
 
 import cn.palmte.work.bean.ApproveStatusEnum;
 import org.hibernate.annotations.GenericGenerator;
+import top.jfunc.common.datetime.DatetimeUtils;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
@@ -436,4 +437,11 @@ public class Project {
     public void setApproveId(int approveId) {
         this.approveId = approveId;
     }
+
+    public String getStartDateYM(){
+        return DatetimeUtils.toStr(this.startDate,"yyyy-MM");
+    }
+    public String getEndDateYM(){
+        return DatetimeUtils.toStr(this.endDate,"yyyy-MM");
+    }
 }
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 0f8c683..3322d8e 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}" placeholder="项目计划开始时间"
+                                   value="${project.startDate?string("yyyy-MM")}" 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}" placeholder="项目计划结束时间"
+                                   value="${project.endDate?string("yyyy-MM")}" placeholder="项目计划结束时间"
                                    data-am-datepicker>
                         </div>
                     </div>