Merge remote-tracking branch 'origin/dev_patrol_stats' into develop

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

@@ -252,7 +252,8 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		if (record.getPatrolStartTime().compareTo(endTime) > 0) {
 			throw new RenException(EpmetErrorCode.PATROL_END_TIME_ERROR.getCode());
 		}
-		record.setActrualEndTime(new Date());
+		Date actrualEndTime = new Date();
+		record.setActrualEndTime(actrualEndTime);
 		record.setUpdatedTime(null);
 		// 方便巡查统计表使用
 		Date patrolEndTime = DateUtils.parse(formDTO.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN);
@@ -272,7 +273,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl<StaffPatrolRec
 		detailEntity.setSpeed(formDTO.getSpeed());
 		staffPatrolDetailService.insert(detailEntity);
 		// 添加巡查统计表逻辑
-		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,record.getPatrolStartTime(),patrolEndTime,record.getGrid());
+		statsPatrolUpdateEnd(tokenDto.getUserId(),totalTime,record.getPatrolStartTime(),actrualEndTime,record.getGrid());
 	}
 
 	/**