|
|
@@ -708,11 +708,20 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
|
|
|
for (OutPublicReleaseList e : list) {
|
|
|
if (e.getStatus()==1){
|
|
|
- if (((e.getPublicType()==0||e.getPublicType()==2)
|
|
|
- &&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))){
|
|
|
- e.setAdminExamine(e.getReviewerName()+" 未审核");
|
|
|
+ if (e.getType()==3){
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
+ for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
+ if(ap.getType()==1)str=str.append(ap.getReviewerName()+" 未审核,");
|
|
|
+ }
|
|
|
+ e.setAdminExamine(str.substring(0,str.length()-1));
|
|
|
}else {
|
|
|
- e.setAdminExamine(e.getUserAdminName()+" 未审核");
|
|
|
+ if (((e.getPublicType()==0||e.getPublicType()==2)
|
|
|
+ &&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))){
|
|
|
+ e.setAdminExamine(e.getReviewerName()+" 未审核");
|
|
|
+ }else {
|
|
|
+ e.setAdminExamine(e.getUserAdminName()+" 未审核");
|
|
|
+ }
|
|
|
}
|
|
|
}else if (e.getStatus()==0) {
|
|
|
e.setAdminExamine("");
|