|
|
@@ -1013,28 +1013,30 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseMapper.update(newPublic2);
|
|
|
addpublicLog(e.getId(), status, remarks);
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- //审核需看是否所有人审核
|
|
|
- List<PublicRelease> newList = publicReleaseMapper.selectByMainId(use.getId(),3,null);
|
|
|
- int count = 0;
|
|
|
- for (PublicRelease e : newList) {
|
|
|
- if (e.getStatus()==2){
|
|
|
- count++;
|
|
|
+ //审核需看是否所有人审核
|
|
|
+ List<PublicRelease> newList = publicReleaseMapper.selectByMainId(use.getId(),3,null);
|
|
|
+ int count = 0;
|
|
|
+ for (PublicRelease e : newList) {
|
|
|
+ if (e.getStatus()==2){
|
|
|
+ count++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(count==newList.size()){
|
|
|
+ PublicRelease newPublic2=new PublicRelease();
|
|
|
+ newPublic2.setId(use.getId());
|
|
|
+ newPublic2.setStatus(2);
|
|
|
+ publicReleaseMapper.update(newPublic2);
|
|
|
+ sendNoticeAndSoucket(use.getAid(),status,content.toString());
|
|
|
+ }else {
|
|
|
+ PublicRelease newPublic2=new PublicRelease();
|
|
|
+ newPublic2.setId(use.getId());
|
|
|
+ newPublic2.setStatus(1);
|
|
|
+ publicReleaseMapper.update(newPublic2);
|
|
|
}
|
|
|
}
|
|
|
- if(count==newList.size()){
|
|
|
- PublicRelease newPublic2=new PublicRelease();
|
|
|
- newPublic2.setId(use.getId());
|
|
|
- newPublic2.setStatus(2);
|
|
|
- publicReleaseMapper.update(newPublic2);
|
|
|
- sendNoticeAndSoucket(use.getAid(),status,content.toString());
|
|
|
- }else {
|
|
|
- PublicRelease newPublic2=new PublicRelease();
|
|
|
- newPublic2.setId(use.getId());
|
|
|
- newPublic2.setStatus(1);
|
|
|
- publicReleaseMapper.update(newPublic2);
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
return 1;
|
|
|
}
|
|
|
|