diff --git a/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java b/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java index a4dd88bb6..a1be595d0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/entity/LocationData.java @@ -183,7 +183,7 @@ public class LocationData implements Serializable { @ApiModelProperty(value = "隧道ID") private String tunnelId; @ApiModelProperty(value = "工作时长(秒)") - private Integer workingTime; + private Integer stayTime; @Excel(name = "班组名称 ", width = 15) @ApiModelProperty(value = "班组名称 ") private String teamName; diff --git a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java index b42af42b3..1fb4588dd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java @@ -60,8 +60,8 @@ public class LocationDataServiceImpl extends ServiceImpl locationDataList = baseMapper.getRealTimeLocationWorker(paramMap); for (LocationData locationData : locationDataList) { - if (locationData.getWorkingTime() != null) { - locationData.setWorkingTimeName(TimeUtil.toHourMinSecond(locationData.getWorkingTime())); + if (locationData.getStayTime() != null) { + locationData.setWorkingTimeName(TimeUtil.toHourMinSecond(locationData.getStayTime())); } } return locationDataList;