|
|
@@ -714,7 +714,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
if(ap.getType()==1)str=str.append(ap.getReviewerName()+",");
|
|
|
}
|
|
|
- e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
+
|
|
|
+ if(str.length()>1)e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
}else {
|
|
|
if (((e.getPublicType()==0||e.getPublicType()==2)
|
|
|
&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))){
|
|
|
@@ -1476,14 +1477,23 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ //如果审核中
|
|
|
if (out.getStatus()==1&&
|
|
|
((out.getPublicType()==0||out.getPublicType()==2)&&(out.getTechStartProcess()==0||out.getTechStartProcess()==2)))
|
|
|
{
|
|
|
+
|
|
|
if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
StringBuffer str =new StringBuffer();
|
|
|
- for (AdminPublicReviewerBo e : adminPublicReviewerBos) {
|
|
|
- str.append(e.getReviewerName()+",");
|
|
|
+ if(out.getType()==3){
|
|
|
+ List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
+ for (AdminPublicReviewerBo e : collect) {
|
|
|
+ str.append(e.getReviewerName()+",");
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ for (AdminPublicReviewerBo e : collect) {
|
|
|
+ str.append(e.getReviewerName()+",");
|
|
|
+ }
|
|
|
}
|
|
|
out.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
}else if (out.getStatus()==0) {
|