|
@@ -1028,6 +1028,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
newPublic2.setStatus(2);
|
|
newPublic2.setStatus(2);
|
|
|
publicReleaseMapper.update(newPublic2);
|
|
publicReleaseMapper.update(newPublic2);
|
|
|
sendNoticeAndSoucket(use.getAid(),status,content.toString());
|
|
sendNoticeAndSoucket(use.getAid(),status,content.toString());
|
|
|
|
|
+ }else {
|
|
|
|
|
+ PublicRelease newPublic2=new PublicRelease();
|
|
|
|
|
+ newPublic2.setId(use.getId());
|
|
|
|
|
+ newPublic2.setStatus(1);
|
|
|
|
|
+ publicReleaseMapper.update(newPublic2);
|
|
|
}
|
|
}
|
|
|
return 1;
|
|
return 1;
|
|
|
}
|
|
}
|
|
@@ -1635,6 +1640,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
//获取技术协单
|
|
//获取技术协单
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
|
List<String> names=new ArrayList<>();
|
|
List<String> names=new ArrayList<>();
|
|
|
|
|
+ List<String> ids=new ArrayList<>();
|
|
|
for (PublicRelease e : publicReleases) {
|
|
for (PublicRelease e : publicReleases) {
|
|
|
if (e.getStatus()==1){
|
|
if (e.getStatus()==1){
|
|
|
adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
@@ -1642,6 +1648,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (AdminPublicReviewerBo e1 : collect) {
|
|
for (AdminPublicReviewerBo e1 : collect) {
|
|
|
if (!names.contains(e1.getReviewerName())){
|
|
if (!names.contains(e1.getReviewerName())){
|
|
|
names.add(e1.getReviewerName());
|
|
names.add(e1.getReviewerName());
|
|
|
|
|
+ ids.add(e1.getReviewerId());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1649,6 +1656,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (String name : names) {
|
|
for (String name : names) {
|
|
|
str.append(name+",");
|
|
str.append(name+",");
|
|
|
}
|
|
}
|
|
|
|
|
+ out.setMyExamine(1);
|
|
|
|
|
+ for (String s : ids) {
|
|
|
|
|
+ if (s.equals(TokenManager.getAdminId())){
|
|
|
|
|
+ out.setMyExamine(0);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
for (AdminPublicReviewerBo e : collect) {
|