|
@@ -2084,11 +2084,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
|
|
if (adminPublicReviewerBos ==null) adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
if (adminPublicReviewerBos ==null) adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
StringBuffer str =new StringBuffer();
|
|
StringBuffer str =new StringBuffer();
|
|
|
|
|
+ //技术协单,获取协单审核人
|
|
|
if(out.getType()==3){
|
|
if(out.getType()==3){
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
str.append(e.getReviewerName()+",");
|
|
str.append(e.getReviewerName()+",");
|
|
|
}
|
|
}
|
|
|
|
|
+ //业务公出且协单部分审核(看着流程有点问题)
|
|
|
}else if (out.getType()==0&& out.getAssistProcess()==2){
|
|
}else if (out.getType()==0&& out.getAssistProcess()==2){
|
|
|
//获取技术协单
|
|
//获取技术协单
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
@@ -2116,6 +2118,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
// }
|
|
// }
|
|
|
// }
|
|
// }
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ //业务公出,且协单审核完成?
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
str.append(e.getReviewerName()+",");
|
|
str.append(e.getReviewerName()+",");
|