|
|
@@ -402,6 +402,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}else {
|
|
|
str2.append(my.getName()).append("(需审核),准备公出您的企业")
|
|
|
.append("[").append(u.getNickname()).append("]。");
|
|
|
+ //添加审核
|
|
|
addPublicExamine(in.getId(), admin);
|
|
|
if (in.getPublicType() == null || in.getPublicType() == 0) in.setPublicType(1);
|
|
|
//审核通知
|
|
|
@@ -1149,6 +1150,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
addpublicLog(id, status, "无需二级审核直接通过");
|
|
|
}else {
|
|
|
if(use.getProcessStatus()==0||use.getProcessStatus()==1){
|
|
|
+ //一级审核
|
|
|
p.setStatus(1);
|
|
|
p.setProcessStatus(2);
|
|
|
str=str.append(remarks);
|
|
|
@@ -1159,6 +1161,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
sendNoticeAndSoucket(e.getReviewerId(),status,content.toString());
|
|
|
}
|
|
|
}else if (use.getProcessStatus()==2){
|
|
|
+ //二级审核,新增判定是否是审核人
|
|
|
+ boolean flag = false;
|
|
|
+ for (AdminPublicReviewerBo e : adminPublicReviewerBos) {
|
|
|
+ if (e.getReviewerId().equals(aid)){
|
|
|
+ flag = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!flag){
|
|
|
+ throw new BusinessException("请勿重复审核,二级审核错误!");
|
|
|
+ }
|
|
|
p.setStatus(2);
|
|
|
p.setProcessStatus(3);
|
|
|
//如果是协单公出主公出,在审核通过
|