|
|
@ -361,12 +361,12 @@ public class AccessTicketServiceImpl extends ServiceImpl<AccessTicketMapper, Acc |
|
|
|
for (Dict dict : dicts){ |
|
|
|
for (Dict dict : dicts){ |
|
|
|
if(StringUtils.isNotEmpty(access.getDangerous())){ |
|
|
|
if(StringUtils.isNotEmpty(access.getDangerous())){ |
|
|
|
if(access.getDangerous().contains(dict.getDictKey())){ |
|
|
|
if(access.getDangerous().contains(dict.getDictKey())){ |
|
|
|
dangerous.append(" √").append(dict.getDictValue()); |
|
|
|
dangerous.append(" [√]").append(dict.getDictValue()); |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
dangerous.append(" ").append(dict.getDictValue()); |
|
|
|
dangerous.append(" []").append(dict.getDictValue()); |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
dangerous.append(" ").append(dict.getDictValue()); |
|
|
|
dangerous.append(" []").append(dict.getDictValue()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
params.setDangerous(dangerous.toString()); |
|
|
|
params.setDangerous(dangerous.toString()); |
|
|
@ -391,6 +391,8 @@ public class AccessTicketServiceImpl extends ServiceImpl<AccessTicketMapper, Acc |
|
|
|
params.setStudyMembers(meberNames.toString()); |
|
|
|
params.setStudyMembers(meberNames.toString()); |
|
|
|
} |
|
|
|
} |
|
|
|
// 检修工作票创建时间
|
|
|
|
// 检修工作票创建时间
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Calendar create = Calendar.getInstance(); |
|
|
|
Calendar create = Calendar.getInstance(); |
|
|
|
create.setTime(access.getCreateTime()); |
|
|
|
create.setTime(access.getCreateTime()); |
|
|
|
params.setCreate(DateUtil.format(access.getCreateTime(),DateUtil.PATTERN_DATETIME)); |
|
|
|
params.setCreate(DateUtil.format(access.getCreateTime(),DateUtil.PATTERN_DATETIME)); |
|
|
|