|
|
@@ -732,14 +732,30 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
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))){
|
|
|
+ &&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))
|
|
|
+ &&(e.getAssistProcess()==0||e.getAssistProcess()==1)
|
|
|
+ ){
|
|
|
StringBuffer str =new StringBuffer();
|
|
|
adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
|
|
|
}
|
|
|
e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
- }else {
|
|
|
+ }else if (e.getType()==0&&e.getAssistProcess()==2){
|
|
|
+ //获取技术协单
|
|
|
+ List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(e.getId(), null, null);
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
+ for (PublicRelease e2 : publicReleases) {
|
|
|
+ if (e2.getStatus()==1){
|
|
|
+ adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e2.getAid());
|
|
|
+ List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e1 -> e1.getType() == 1).collect(Collectors.toList());
|
|
|
+ for (AdminPublicReviewerBo e1 : collect) {
|
|
|
+ str.append(e1.getReviewerName()+",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
+ } else {
|
|
|
String s = publicReleaseDetailsMapper.selectUserAdminByPrid(e.getId());
|
|
|
e.setAdminExamine(s+" 未审核");
|
|
|
}
|
|
|
@@ -1528,11 +1544,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
if (out.getType()==0||out.getType()==1||out.getType()==2){
|
|
|
if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
- List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
- for (AdminPublicReviewerBo e : collect) {
|
|
|
- if (e.getReviewerId().equals(aid)){
|
|
|
- flag=false;
|
|
|
- break;
|
|
|
+ if (out.getAssistProcess()==0||out.getAssistProcess()==1){
|
|
|
+ List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ for (AdminPublicReviewerBo e : collect) {
|
|
|
+ if (e.getReviewerId().equals(aid)){
|
|
|
+ flag=false;
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}else if(out.getType()==3){
|
|
|
@@ -1589,12 +1607,26 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
str.append(e.getReviewerName()+",");
|
|
|
}
|
|
|
- }else {
|
|
|
+ }else if (out.getType()==0&&out.getAssistProcess()==2){
|
|
|
+ //获取技术协单
|
|
|
+ List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
|
+ 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()+",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
str.append(e.getReviewerName()+",");
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
if(str.length()>1)out.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
}else if (out.getStatus()==0) {
|
|
|
out.setAdminExamine("");
|