|
|
@@ -710,8 +710,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
|
|
|
for (OutPublicReleaseList e : list) {
|
|
|
if (e.getStatus()==1){
|
|
|
- List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos=null;
|
|
|
if (e.getType()==3){
|
|
|
+ adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
StringBuffer str =new StringBuffer();
|
|
|
for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
if(ap.getType()==1)str=str.append(ap.getReviewerName()+",");
|
|
|
@@ -722,6 +723,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (((e.getPublicType()==0||e.getPublicType()==2)
|
|
|
&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))){
|
|
|
StringBuffer str =new StringBuffer();
|
|
|
+ adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
|
|
|
}
|
|
|
@@ -747,13 +749,26 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- List<PublicAssistAdvice> publicAssistAdvices = publicAssistAdviceMapper.selectList(e.getId(), 0);
|
|
|
- if (publicAssistAdvices.isEmpty()){
|
|
|
- e.setPublicAssistAdvice(0);
|
|
|
+ if(e.getType()==3){
|
|
|
+ List<PublicAssistAdvice> publicAssistAdvices = publicAssistAdviceMapper.selectList(e.getId(), 0);
|
|
|
+ if (publicAssistAdvices.isEmpty()){
|
|
|
+ e.setPublicAssistAdvice(0);
|
|
|
+ }else {
|
|
|
+ e.setPublicAssistAdvice(publicAssistAdvices.size());
|
|
|
+
|
|
|
+ }
|
|
|
}else {
|
|
|
- e.setPublicAssistAdvice(publicAssistAdvices.size());
|
|
|
+ List<PublicAssistAdvice> publicAssistAdvices = publicAssistAdviceMapper.selectList(e.getId(), 1);
|
|
|
+ if (publicAssistAdvices.isEmpty()){
|
|
|
+ e.setPublicAssistAdvice(0);
|
|
|
+ }else {
|
|
|
+ e.setPublicAssistAdvice(publicAssistAdvices.size());
|
|
|
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|