From f3e0f71b8e6951bf04019c4644bc3b76435d5a9f Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 20 May 2020 10:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B6=88=E6=81=AF=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/UserMessageConstant.java     | 9 +++++++--
 .../java/com/epmet/service/impl/ProjectServiceImpl.java  | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/UserMessageConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/UserMessageConstant.java
index 62f64e8a96..756a599ac3 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/UserMessageConstant.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/UserMessageConstant.java
@@ -9,11 +9,16 @@ public interface UserMessageConstant {
     /**
      * 消息标题
      */
-    String ISSUE_TITLE = "您有一条项目消息";
+    String PROJECT_TITLE = "您有一条项目消息";
 
     /**
      * 议题转项目、项目流转、项目退回消息模板
      */
-    String ISSUE_RESLOVED_MSG = "您好。您收到一条【%s】的新信息，请您尽快处理。";
+    String PROJECT_RESOLVED_MSG = "您好。您收到一条【%s】的新信息，请您尽快处理。";
+
+    /**
+     * 项目结案消息模板
+     */
+    String PROJECT_CLOSED_MSG = "您好，您参与的【%s】项目已结案，原因：%s";
 
 }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 11089feddb..a903e21050 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -186,7 +186,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (ProjectConstant.CLOSED.equals(p.getStatus())) {
 				created.setDepartmentNameList(departmentNameList);
 				created.setWarningFlag(false);
-				created.setDetentionDays("0");
+				created.setDetentionDays(NumConstant.ZERO_STR);
 			} else {
 				String detentionDays = getDetentionDays(p);
 				if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) {
@@ -229,7 +229,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			if (ProjectConstant.CLOSED.equals(p.getStatus())) {
 				involved.setDepartmentNameList(departmentNameList);
 				involved.setWarningFlag(false);
-				involved.setDetentionDays("0");
+				involved.setDetentionDays(NumConstant.ZERO_STR);
 			} else {
 				String detentionDays = getDetentionDays(p);
 				if (!ONE_DAY.equals(detentionDays) && Integer.parseInt(detentionDays) > finalDays) {
@@ -258,7 +258,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			projectStaffDTO.setProjectId(fromDTO.getProjectId());
 			projectStaffDTO.setStaffId(fromDTO.getUserId());
 			List<DepartmentResultDTO> departmentList = projectStaffService.getDepartmentNameList(projectStaffDTO);
-			if (null != departmentList && departmentList.size() > 0) {
+			if (null != departmentList && departmentList.size() > NumConstant.ZERO) {
 				resultDTO.setProcessable(true);
 			} else {
 				resultDTO.setProcessable(false);
@@ -404,7 +404,7 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 		workDayFormDTO.setEndDate(format.format(new Date()));
 		list.add(workDayFormDTO);
 		Result<List<WorkDayResultDTO>> detentionDays = commonFeignClient.detentionDays(list);
-		return detentionDays.getData().get(0).getDetentionDays();
+		return detentionDays.getData().get(NumConstant.ZERO).getDetentionDays();
 	}
 
 	/**