From f74080fb3bb45b07a7a38c3a2f14f6b918aee3f6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 23 Jun 2021 14:18:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1=E6=9F=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/exception/EpmetErrorCode.java | 1 + .../epmet/service/impl/StaffPatrolRecordServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 25e0a4d4d9..86edad6f0b 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 @@ -109,6 +109,7 @@ public enum EpmetErrorCode { ONLINE_BADGE_COUNT(8517, "最多上线5个徽章"), PATROL_REPEATED_SUBMIT_ERROR(8521, "巡查已结束，请勿重复提交"), PATROL_END_TIME_ERROR(8522, "巡查结束时间不能小于巡查开始时间"), + TIME_FORMAT_ERROR(8523, "时间格式错误"), // 该错误不会提示给前端，只是后端传输错误信息用。 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 bdc2d9d86b..fd9e5891cd 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 @@ -191,7 +191,11 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl 0) { + Date endTime = DateUtils.parse(formDTO.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN); + if (null == endTime) { + throw new RenException(EpmetErrorCode.TIME_FORMAT_ERROR.getCode()); + } + if (record.getPatrolStartTime().compareTo(endTime) > 0) { throw new RenException(EpmetErrorCode.PATROL_END_TIME_ERROR.getCode()); } record.setActrualEndTime(new Date());