14913 安全措施确认人签字后 安全措施确认人签字信息 时间显示重复 后续审批流程都要改
parent
b2dd1fb2f6
commit
97f1e154f2
|
@ -451,6 +451,11 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
|
||||||
}
|
}
|
||||||
pd.put("confessUserNames", confess.stream().map(x -> x.getString("USER_NAME")).collect(Collectors.joining(",")));
|
pd.put("confessUserNames", confess.stream().map(x -> x.getString("USER_NAME")).collect(Collectors.joining(",")));
|
||||||
pd.put("confessList", confess);
|
pd.put("confessList", confess);
|
||||||
|
if (confess.stream().anyMatch(x -> "0".equals(x.getString("APPROVAL_STATUS")))){
|
||||||
|
pd.put("confessStatus", "0");
|
||||||
|
}else {
|
||||||
|
pd.put("confessStatus", "1");
|
||||||
|
}
|
||||||
|
|
||||||
// 项目责任负责人
|
// 项目责任负责人
|
||||||
PageData belong = approvalInfos.stream().filter(x -> "1".equals(x.getString("TYPE"))).findFirst().orElse(null);
|
PageData belong = approvalInfos.stream().filter(x -> "1".equals(x.getString("TYPE"))).findFirst().orElse(null);
|
||||||
|
|
Loading…
Reference in New Issue