|
|
@@ -1230,7 +1230,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
inpe.setPrid(use.getId());
|
|
|
publicExamineMapper.updateStatusByPrid(inpe);
|
|
|
}
|
|
|
- }else if(status==2){//同意区分是1级审核还是二级审核
|
|
|
+ }else if(status==2){
|
|
|
+ //同意区分是1级审核还是二级审核
|
|
|
str=str.append("同意,");
|
|
|
addpublicLog(id, status, remarks);
|
|
|
content=content.append("已通过审核!");
|
|
|
@@ -1463,6 +1464,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (use.getAssistProcess()!=2){
|
|
|
throw new BusinessException("该公出不是待协单审核的公出。");
|
|
|
}
|
|
|
+ //通过审核主公出来辐射到协单公出
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainIdAndReviewer(id, TokenManager.getAdminId());
|
|
|
String content=use.getUserNames()+"公司的外出协单申请";
|
|
|
PublicRelease newPublic=new PublicRelease();
|