From f776431c0e3c9ca4f5027e437da09ae15966e2d2 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Sat, 8 Mar 2025 11:33:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=91=E5=B7=9E=E6=B0=B4=E5=88=A9=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/modules/location/entity/LocationData.java | 2 +- .../location/service/impl/LocationDataServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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;