网格员巡查功能接口bug修改

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, "添加客户根级组织失败"),

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffPatrolRecordServiceImpl.java

@@ -191,7 +191,11 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		if (PatrolConstant.END.equals(record.getStatus())) {
 			throw new RenException(EpmetErrorCode.PATROL_REPEATED_SUBMIT_ERROR.getCode());
 		}
-		if (record.getPatrolStartTime().compareTo(Objects.requireNonNull(DateUtils.parse(formDTO.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN))) > 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());