|
|
@@ -984,47 +984,51 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
@Override
|
|
|
public Object updateAssistExamine(Integer id, Integer status, String remarks) {
|
|
|
PublicRelease use = publicReleaseMapper.queryById(id);
|
|
|
- PublicRelease mianUse = publicReleaseMapper.selectSonIdByMain(id);
|
|
|
- if (use.getAssist()!=2 && use.getStatus()!=1){
|
|
|
+ if (use.getAssistProcess()!=2){
|
|
|
throw new BusinessException("该公出不是待协单审核的公出。");
|
|
|
}
|
|
|
+ List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainIdAndReviewer(id, TokenManager.getAdminId());
|
|
|
String content=use.getUserNames()+"公司的外出协单申请";
|
|
|
PublicRelease newPublic=new PublicRelease();
|
|
|
if (status==0){
|
|
|
content+="已被驳回。";
|
|
|
- addpublicLog(mianUse.getId(), status, remarks);
|
|
|
- newPublic.setId(mianUse.getId());
|
|
|
+ addpublicLog(use.getId(), status, remarks);
|
|
|
+ newPublic.setId(use.getId());
|
|
|
newPublic.setStatus(status);
|
|
|
- PublicRelease newPublic2=new PublicRelease();
|
|
|
addpublicLog(id, status, remarks);
|
|
|
- newPublic2.setId(use.getId());
|
|
|
- newPublic2.setStatus(status);
|
|
|
- publicReleaseMapper.update(newPublic2);
|
|
|
+ for (PublicRelease e : publicReleases) {
|
|
|
+ PublicRelease newPublic2=new PublicRelease();
|
|
|
+ newPublic2.setId(e.getId());
|
|
|
+ newPublic2.setStatus(status);
|
|
|
+ publicReleaseMapper.update(newPublic2);
|
|
|
+ addpublicLog(e.getId(), status, remarks);
|
|
|
+ }
|
|
|
}else if(status==2){
|
|
|
content+="已通过审核。";
|
|
|
- addpublicLog(id, status, remarks);
|
|
|
- newPublic.setId(use.getId());
|
|
|
- newPublic.setStatus(status);
|
|
|
+ for (PublicRelease e : publicReleases) {
|
|
|
+ PublicRelease newPublic2=new PublicRelease();
|
|
|
+ newPublic2.setId(e.getId());
|
|
|
+ newPublic2.setStatus(status);
|
|
|
+ publicReleaseMapper.update(newPublic2);
|
|
|
+ addpublicLog(e.getId(), status, remarks);
|
|
|
+ }
|
|
|
}
|
|
|
- publicReleaseMapper.update(newPublic);
|
|
|
+
|
|
|
//审核需看是否所有人审核
|
|
|
- List<PublicRelease> newList = publicReleaseMapper.selectByMainId(mianUse.getId(),3,null);
|
|
|
+ List<PublicRelease> newList = publicReleaseMapper.selectByMainId(use.getId(),3,null);
|
|
|
int count = 0;
|
|
|
for (PublicRelease e : newList) {
|
|
|
if (e.getStatus()==2){
|
|
|
count++;
|
|
|
}
|
|
|
}
|
|
|
- if (mianUse.getStatus()==1){
|
|
|
- addpublicLog(mianUse.getId(), status, remarks);
|
|
|
- }
|
|
|
if(count==newList.size()){
|
|
|
PublicRelease newPublic2=new PublicRelease();
|
|
|
- newPublic2.setId(mianUse.getId());
|
|
|
+ newPublic2.setId(use.getId());
|
|
|
newPublic2.setStatus(2);
|
|
|
publicReleaseMapper.update(newPublic2);
|
|
|
+ sendNoticeAndSoucket(use.getAid(),status,content.toString());
|
|
|
}
|
|
|
- sendNoticeAndSoucket(mianUse.getAid(),status,content.toString());
|
|
|
return 1;
|
|
|
}
|
|
|
|