From b75757b77b9ccf483c3626e14bde80e71a8a9f4f Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 15 Jun 2021 16:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1=E6=9F=A5?=
 =?UTF-8?q?=20=E9=94=99=E8=AF=AF=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/exception/EpmetErrorCode.java     | 3 ++-
 .../com/epmet/service/impl/StaffPatrolRecordServiceImpl.java  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 3faf895eb5..25e0a4d4d9 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -107,7 +107,8 @@ public enum EpmetErrorCode {
 	DUPLICATE_BADGE_NAME(8515, "徽章名已存在"),
 	DUPLICATE_PARTY_BADGE_NAME(8516, "不可删除党员徽章"),
 	ONLINE_BADGE_COUNT(8517, "最多上线5个徽章"),
-
+	PATROL_REPEATED_SUBMIT_ERROR(8521, "巡查已结束，请勿重复提交"),
+	PATROL_END_TIME_ERROR(8522, "巡查结束时间不能小于巡查开始时间"),
     // 该错误不会提示给前端，只是后端传输错误信息用。
     ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"),
     OPER_ADD_CUSTOMER_ROOT_AGENCY_ERROR(8702, "添加客户根级组织失败"),
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
index 0001d51549..bdc2d9d86b 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java
@@ -189,10 +189,10 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 			throw new RenException("巡查记录不存在");
 		}
 		if (PatrolConstant.END.equals(record.getStatus())) {
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), "巡查已结束，请勿重复提交");
+			throw new RenException(EpmetErrorCode.PATROL_REPEATED_SUBMIT_ERROR.getCode());
 		}
 		if (record.getPatrolStartTime().compareTo(Objects.requireNonNull(DateUtils.parse(formDTO.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN))) > 0) {
-			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), "巡查结束时间不能小于巡查开始时间");
+			throw new RenException(EpmetErrorCode.PATROL_END_TIME_ERROR.getCode());
 		}
 		record.setActrualEndTime(new Date());
 		record.setUpdatedTime(null);