From 7fd5948491ed91db4188a8d6134a066706c8f72a Mon Sep 17 00:00:00 2001
From: liuxi <liuxi@szxgl.cn>
Date: Fri, 18 Jun 2021 16:21:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nbclass/szxgl/service/impl/ProjectServiceImpl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java b/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java
index 4e731a7..07de285 100644
--- a/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java
@@ -400,7 +400,7 @@ public class ProjectServiceImpl implements ProjectService {
 				+ "</div><br><br>" + "项目名称：" + name
 				+ "<br>" + "客户单位："
 				+ projectClientService.getNamesById(p.getProjectClientId()) + "<br>" + "计划时间："
-				+ DateUtil.date2String(p.getStartTime(), "MM-dd") + " ~ " + DateUtil.date2String(p.getEndTime(), "MM-dd")
+				+ DateUtil.date2String(p.getStartTime(), "MM-dd") + " ~ " + DateUtil.date2String(p.getPlanTime(), "MM-dd")
 				+ "<br>" + "负责人：" + fzrNames  // StringUtils.trimToEmpty(StringUtils.join(fzrNames, ","))
 				+ "<br>" + "创建人：" + syUsersMapper.findByUserName(p.getCreateUserId()).getTrueName();
 		if (StringUtils.isNotBlank(toUser)) {
@@ -473,7 +473,8 @@ public class ProjectServiceImpl implements ProjectService {
 		oldPro.setName(p.getName());
 		oldPro.setContent(p.getContent());
 		oldPro.setStartTime(p.getStartTime());
-		oldPro.setEndTime(p.getEndTime());
+		//oldPro.setEndTime(p.getEndTime());
+        oldPro.setPlanTime(p.getPlanTime());
 		oldPro.setType(p.getType());
 		oldPro.setStatus(p.getStatus());
 		oldPro.setImportance(p.getImportance());