|
|
@@ -493,6 +493,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
public int pushExaminePublicRelease(Integer id, Integer status, String remarks,Integer examineType) {
|
|
|
PublicRelease p=new PublicRelease();
|
|
|
Date date =new Date();
|
|
|
+ boolean flag=false;
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
p.setId(id);
|
|
|
PublicRelease use=publicReleaseMapper.selectByPrimaryKey(id);
|
|
|
@@ -540,6 +541,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
p.setAuditTime(date);
|
|
|
p.setRejectName(ad.getName());
|
|
|
addpublicLog(id, status, remarks);
|
|
|
+ flag=true;
|
|
|
//营销员审核
|
|
|
}else if (examineType==1){
|
|
|
//通知公出人切换成公出人审核人
|
|
|
@@ -565,8 +567,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
if (x==publicExamines.size()){
|
|
|
p.setPublicType(2);
|
|
|
+ flag=true;
|
|
|
}
|
|
|
addpublicLog(id, status, str.toString());
|
|
|
+
|
|
|
}else if (status==0){//审核驳回
|
|
|
//切换通知人公出负责人
|
|
|
a=publicAdmin;
|
|
|
@@ -580,7 +584,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
- sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
+ if (flag){
|
|
|
+ sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
+ }
|
|
|
if (p.getStatus()!=null||p.getPublicType()!=null){
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(p);
|
|
|
}
|