中水北方修改
This commit is contained in:
parent
3d34bd6dc1
commit
355db840c1
@ -417,6 +417,10 @@ public class WorkerInfo implements Serializable {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "中水北方,进入超24小时未出进行人员预警信息")
|
@ApiModelProperty(value = "中水北方,进入超24小时未出进行人员预警信息")
|
||||||
private String alarmFlag;
|
private String alarmFlag;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
@ApiModelProperty(value = "最新考勤时间")
|
||||||
|
private String attendTime;
|
||||||
/**
|
/**
|
||||||
* 通知的人员id
|
* 通知的人员id
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -359,10 +359,12 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
|
|||||||
if (StrUtil.isNotBlank(regionIdForUface)) {
|
if (StrUtil.isNotBlank(regionIdForUface)) {
|
||||||
for (WorkerInfo workerInfo : list) {
|
for (WorkerInfo workerInfo : list) {
|
||||||
for (Map<String, Object> stringObjectMap : workerAttendList) {
|
for (Map<String, Object> stringObjectMap : workerAttendList) {
|
||||||
if (workerInfo.getId().toString().equals(stringObjectMap.get("id").toString()) && stringObjectMap.get("enterHour") != null
|
if (workerInfo.getId().toString().equals(stringObjectMap.get("id").toString())) {
|
||||||
&& Integer.valueOf(stringObjectMap.get("enterHour").toString()) > 24) {
|
if (stringObjectMap.get("enterHour") != null && Integer.valueOf(stringObjectMap.get("enterHour").toString()) > 24) {
|
||||||
workerInfo.setAlarmFlag("人员在场超过" + Integer.valueOf(stringObjectMap.get("enterHour").toString()) + "小时,请确认人员是否安全");
|
workerInfo.setAlarmFlag("人员在场超过" + Integer.valueOf(stringObjectMap.get("enterHour").toString()) + "小时,请确认人员是否安全");
|
||||||
}
|
}
|
||||||
|
workerInfo.setAttendTime(stringObjectMap.get("minTime").toString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user