|
|
@@ -597,22 +597,24 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
|
|
|
for (OutPublicReleaseList e : list) {
|
|
|
if (e.getStatus()==1&&
|
|
|
- ((e.getPublicType()==0||e.getPublicType()==2)||(e.getTechStartProcess()==0||e.getTechStartProcess()==2))
|
|
|
+ ((e.getPublicType()==0||e.getPublicType()==2)&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))
|
|
|
){
|
|
|
e.setAdminExamine(e.getReviewerName()+" 未审核");
|
|
|
- }
|
|
|
- if (!publicExamines.isEmpty()){
|
|
|
- StringBuffer str =new StringBuffer();
|
|
|
- for (PublicExamine pe : publicExamines) {
|
|
|
- if (e.getId().equals(pe.getPrid())){
|
|
|
- str=str.append(pe.getAname());
|
|
|
- if (pe.getStatus()==0)str=str.append(" 未审核,");
|
|
|
- if (pe.getStatus()==1)str=str.append(" 已审核,");
|
|
|
+ }else {
|
|
|
+ if (!publicExamines.isEmpty()){
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
+ for (PublicExamine pe : publicExamines) {
|
|
|
+ if (e.getId().equals(pe.getPrid())){
|
|
|
+ str=str.append(pe.getAname());
|
|
|
+ if (pe.getStatus()==0)str=str.append(" 未审核,");
|
|
|
+ if (pe.getStatus()==1)str=str.append(" 已审核,");
|
|
|
+ }
|
|
|
+ if (str.length()>1) e.setAdminExamine(str.substring(0,str.length()-1));
|
|
|
}
|
|
|
- if (str.length()>1) e.setAdminExamine(str.substring(0,str.length()-1));
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1154,6 +1156,25 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ if (out.getStatus()==1&&
|
|
|
+ ((out.getPublicType()==0||out.getPublicType()==2)&&(out.getTechStartProcess()==0||out.getTechStartProcess()==2))
|
|
|
+ ){
|
|
|
+ out.setAdminExamine(out.getReviewerName()+" 未审核");
|
|
|
+ }else {
|
|
|
+ if (!ps.isEmpty()){
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
+ for (PublicExamine e : ps) {
|
|
|
+ if (out.getId().equals(e.getPrid())){
|
|
|
+ str.append(e.getAname());
|
|
|
+ if (e.getStatus()==0) str.append(" 未审核,");
|
|
|
+ if (e.getStatus()==1) str.append(" 已审核,");
|
|
|
+ }
|
|
|
+ if (str.length()>1) out.setAdminExamine(str.substring(0,str.length()-1));
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
out.setPrdList(publicReleaseDetailsMapper.selectByPCid(out.getId()));
|
|
|
return out;
|
|
|
}
|