From 303ca757431521b8356232cd4c14cc54864b9a1a Mon Sep 17 00:00:00 2001
From: liuxi <liuxi@szxgl.cn>
Date: Fri, 18 Jun 2021 17:44:34 +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

---
 src/main/java/com/nbclass/szxgl/model/Project.java        | 8 ++++++++
 .../nbclass/szxgl/service/impl/ProjectServiceImpl.java    | 4 ++--
 src/main/resources/mapper/szxgl/ProjectMapper.xml         | 6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nbclass/szxgl/model/Project.java b/src/main/java/com/nbclass/szxgl/model/Project.java
index 00a8410..3c0e970 100644
--- a/src/main/java/com/nbclass/szxgl/model/Project.java
+++ b/src/main/java/com/nbclass/szxgl/model/Project.java
@@ -428,10 +428,18 @@ public class Project {
         return endtime;
     }
 
+
     public void setEndtime(String endtime) {
         this.endtime = endtime;
     }
 
+    public void setPlantime(String plantime) {
+        this.plantime = plantime;
+    }
+    public String getPlantime() {
+        return plantime;
+    }
+
     public String getFzrIds() {
         return fzrIds;
     }
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 07de285..9cc81cb 100644
--- a/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/com/nbclass/szxgl/service/impl/ProjectServiceImpl.java
@@ -399,8 +399,8 @@ public class ProjectServiceImpl implements ProjectService {
 		String description = "<div class=\"gray\">" + DateUtil.date2String(new Date(), "yyyy年MM月dd日 HH:mm")
 				+ "</div><br><br>" + "项目名称：" + name
 				+ "<br>" + "客户单位："
-				+ projectClientService.getNamesById(p.getProjectClientId()) + "<br>" + "计划时间："
-				+ DateUtil.date2String(p.getStartTime(), "MM-dd") + " ~ " + DateUtil.date2String(p.getPlanTime(), "MM-dd")
+				+ projectClientService.getNamesById(p.getProjectClientId()) + "<br>" + "项目时间："
+				+ DateUtil.date2String(p.getStartTime(), "MM-dd") + " ~ " + DateUtil.date2String(p.getEndTime()!=null?p.getEndTime():p.getPlanTime(), "MM-dd")
 				+ "<br>" + "负责人：" + fzrNames  // StringUtils.trimToEmpty(StringUtils.join(fzrNames, ","))
 				+ "<br>" + "创建人：" + syUsersMapper.findByUserName(p.getCreateUserId()).getTrueName();
 		if (StringUtils.isNotBlank(toUser)) {
diff --git a/src/main/resources/mapper/szxgl/ProjectMapper.xml b/src/main/resources/mapper/szxgl/ProjectMapper.xml
index cbc41ba..ab677ca 100644
--- a/src/main/resources/mapper/szxgl/ProjectMapper.xml
+++ b/src/main/resources/mapper/szxgl/ProjectMapper.xml
@@ -54,13 +54,13 @@
 			AND p._status = #{status} 
 		</if>
 		<if test="starttime != null and starttime != ''">
-			<![CDATA[ AND p._start_time >= #{starttime} ]]>
+			<![CDATA[ AND  DATE_FORMAT(p._start_time,"%Y-%m-%d") >= #{starttime} ]]>
 		</if>
 		<if test="endtime != null and endtime != ''">
-			<![CDATA[ AND p._end_time <= #{endtime} ]]>
+			<![CDATA[ AND  DATE_FORMAT(p._end_time,"%Y-%m-%d") <= #{endtime} ]]>
 		</if>
         <if test="plantime != null and plantime != ''">
-            <![CDATA[ AND p._plan_time <= #{plantime} ]]>
+            <![CDATA[ AND  DATE_FORMAT(p._plan_time,"%Y-%m-%d") <= #{plantime} ]]>
         </if>
 		<if test="createUserName != null and createUserName != ''">
 			AND (p._create_user_id=#{createUserName} or pu._table_id=#{createUserName} or ptu._user_id=#{createUserName})