|
|
|
@ -85,7 +85,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService { |
|
|
|
String key = patrolRecord.getGrid().concat(patrolRecord.getStaffId()); |
|
|
|
StatsStaffPatrolRecordDailyDTO patrolRecordDailyDTO = yesterdayStatsMap.get(key); |
|
|
|
if (patrolRecordDailyDTO != null) { |
|
|
|
long total = (patrolRecord.getActrualEndTime().getTime() - patrolRecord.getPatrolStartTime().getTime()) / 1000; |
|
|
|
long total = (patrolRecord.getPatrolEndTime().getTime() - patrolRecord.getPatrolStartTime().getTime()) / 1000; |
|
|
|
if (patrolRecordDailyDTO.getTotalTime() == null) { |
|
|
|
patrolRecordDailyDTO.setTotalTime(NumConstant.ZERO); |
|
|
|
} |
|
|
|
@ -107,7 +107,7 @@ public class BizDataStatsServiceImpl implements BizDataStatsService { |
|
|
|
yesterdayPatrolList.forEach(patrol -> { |
|
|
|
//项目立项时间 在巡查期间时 总数加1
|
|
|
|
long projectCreateTime = projectDTO.getCreatedTime().getTime(); |
|
|
|
if (projectCreateTime>= patrol.getPatrolStartTime().getTime() && projectCreateTime <= patrol.getPatrolEndTime().getTime()) { |
|
|
|
if (projectCreateTime>= patrol.getPatrolStartTime().getTime() && projectCreateTime <= patrol.getPatrolEndTime().getTime()) { |
|
|
|
String unqPatrolKey = getUnqPatrolKey(patrol.getGrid(), patrol.getStaffId()); |
|
|
|
StatsStaffPatrolRecordDailyDTO recordDailyDTO = yesterdayStatsMap.get(unqPatrolKey); |
|
|
|
if (recordDailyDTO == null) { |
|
|
|
|