|
|
@@ -883,17 +883,26 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
@Override
|
|
|
public Object assistExamine(Integer id, Integer status, String remarks) {
|
|
|
PublicRelease use = publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
+ PublicRelease mianUse = publicReleaseMapper.selectSonIdByMain(id);
|
|
|
if (use.getAssist()!=2 && use.getStatus()!=1){
|
|
|
throw new BusinessException("该公出不是待协单审核的公出。");
|
|
|
}
|
|
|
String content=use.getUserNames()+"公司的外出协单申请";
|
|
|
+ PublicRelease newPublic=new PublicRelease();
|
|
|
if (status==0){
|
|
|
content+="已被驳回。";
|
|
|
+ addpublicLog(id, 0, content);
|
|
|
+ newPublic.setId(mianUse.getId());
|
|
|
+ newPublic.setStatus(0);
|
|
|
}else if(status==2){
|
|
|
- content+="已通过审核.";
|
|
|
+ content+="已通过审核。";
|
|
|
+ addpublicLog(id, 2, content);
|
|
|
+ newPublic.setId(use.getId());
|
|
|
+ newPublic.setStatus(2);
|
|
|
}
|
|
|
- sendNoticeAndSoucket("",status,content.toString());
|
|
|
- return null;
|
|
|
+ publicReleaseMapper.updateByPrimaryKeySelective(newPublic);
|
|
|
+ sendNoticeAndSoucket(mianUse.getAid(),status,content.toString());
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
private void updateAdminUserCountPublicRelease(String aid, Date transferTime) {
|