diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java index d79fe4780..82477d253 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/entity/WorkerInfo.java @@ -417,6 +417,10 @@ public class WorkerInfo implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "中水北方,进入超24小时未出进行人员预警信息") private String alarmFlag; + + @TableField(exist = false) + @ApiModelProperty(value = "最新考勤时间") + private String attendTime; /** * 通知的人员id */ diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index 6967c04a2..0f0878c7b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -359,9 +359,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl stringObjectMap : workerAttendList) { - if (workerInfo.getId().toString().equals(stringObjectMap.get("id").toString()) && stringObjectMap.get("enterHour") != null - && Integer.valueOf(stringObjectMap.get("enterHour").toString()) > 24) { - workerInfo.setAlarmFlag("人员在场超过" + Integer.valueOf(stringObjectMap.get("enterHour").toString()) + "小时,请确认人员是否安全"); + if (workerInfo.getId().toString().equals(stringObjectMap.get("id").toString())) { + if (stringObjectMap.get("enterHour") != null && Integer.valueOf(stringObjectMap.get("enterHour").toString()) > 24) { + workerInfo.setAlarmFlag("人员在场超过" + Integer.valueOf(stringObjectMap.get("enterHour").toString()) + "小时,请确认人员是否安全"); + } + workerInfo.setAttendTime(stringObjectMap.get("minTime").toString()); } } }