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 d9f45984ad..8751acbb5f 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 @@ -252,13 +252,13 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl 0) { throw new RenException(EpmetErrorCode.PATROL_END_TIME_ERROR.getCode()); } - Date actrualEndTime = new Date(); - record.setActrualEndTime(actrualEndTime); + record.setActrualEndTime(new Date()); record.setUpdatedTime(null); // 方便巡查统计表使用 Date patrolEndTime = DateUtils.parse(formDTO.getPatrolEndTime(), DateUtils.DATE_TIME_PATTERN); record.setPatrolEndTime(patrolEndTime); - Integer totalTime = DateUtils.calculateSecond(record.getPatrolStartTime(), record.getPatrolEndTime()); + // 总时间+59s,防止筛选项目时漏掉 + Integer totalTime = DateUtils.calculateSecond(record.getPatrolStartTime(), record.getPatrolEndTime()) + 59; record.setTotalTime(totalTime); record.setStatus(PatrolConstant.END); baseDao.updateById(record); @@ -273,7 +273,7 @@ public class StaffPatrolRecordServiceImpl extends BaseServiceImpl