|
|
@@ -1561,6 +1561,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //添加协单审核人可以查看
|
|
|
+ List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
|
+ for (PublicRelease e : publicReleases) {
|
|
|
+ adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
+ List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e2 -> e2.getType() == 1).collect(Collectors.toList());
|
|
|
+ for (AdminPublicReviewerBo e2 : collect) {
|
|
|
+ if (e2.getReviewerId().equals(aid)){
|
|
|
+ flag=false;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}else if(out.getType()==3){
|
|
|
//如果是协单,如果是审核人则可以查看
|
|
|
if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
@@ -1603,7 +1615,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- //如果审核中
|
|
|
+ //设置审核人
|
|
|
if (out.getStatus()==1&&
|
|
|
((out.getPublicType()==0||out.getPublicType()==2)&&(out.getTechStartProcess()==0||out.getTechStartProcess()==2)))
|
|
|
{
|
|
|
@@ -1618,15 +1630,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}else if (out.getType()==0&&out.getAssistProcess()==2){
|
|
|
//获取技术协单
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
|
+ List<String> names=new ArrayList<>();
|
|
|
for (PublicRelease e : publicReleases) {
|
|
|
if (e.getStatus()==1){
|
|
|
adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e1 -> e1.getType() == 1).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e1 : collect) {
|
|
|
- str.append(e1.getReviewerName()+",");
|
|
|
+ if (!names.contains(e1.getReviewerName())){
|
|
|
+ names.add(e1.getReviewerName());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ for (String name : names) {
|
|
|
+ str.append(name+",");
|
|
|
+ }
|
|
|
} else {
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e : collect) {
|