|
|
@@ -746,6 +746,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if(examineType==0){
|
|
|
p.setStatus(status);
|
|
|
if (status==0){
|
|
|
+ addpublicLog(id, status, remarks);
|
|
|
str=str.append("驳回,");
|
|
|
if (use.getAssist()==2){
|
|
|
content=content.append("技术协单被[").append(ad.getName()).append("]拒绝!");
|
|
|
@@ -761,6 +762,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}else if(status==2){
|
|
|
str=str.append("同意,");
|
|
|
+ addpublicLog(id, status, remarks);
|
|
|
//如果是协单公出主公出,在审核通过
|
|
|
if (use.getAssist()==1){
|
|
|
pushPublicReleaseAssist(use,status,date,a);
|
|
|
@@ -773,7 +775,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
p.setAuditInfo(str.toString());
|
|
|
p.setAuditTime(date);
|
|
|
p.setRejectName(ad.getName());
|
|
|
- addpublicLog(id, status, remarks);
|
|
|
+
|
|
|
flag=true;
|
|
|
//营销员审核
|
|
|
}else if (examineType==1){
|
|
|
@@ -1131,7 +1133,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
boolean flag = false;
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
for (outPublicReleaseLog log : collect1) {
|
|
|
- if (log.getAid().equals(e.getAid())){
|
|
|
+ if (log.getAid().equals(e.getReviewerId())){
|
|
|
flag=true;
|
|
|
break;
|
|
|
}
|