|
|
@@ -325,7 +325,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setStatus(1);
|
|
|
log.setStatus(PublicReleaseLog.states.xg.getCode());
|
|
|
in.setUpdateStatus(1);
|
|
|
- if(use.getPublicType()==2||use.getPublicType()==3){
|
|
|
+ //如果是业务切公出则撤销营销审核与审核人
|
|
|
+ if(in.getType()==1&&use.getType()==0){
|
|
|
+ in.setPublicType(0);
|
|
|
+ publicExamineMapper.deletePrid(in.getId());
|
|
|
+
|
|
|
+ }
|
|
|
+ //如果是业务公出,切审核状态为其他,则重置审核
|
|
|
+ if(in.getType()==0&&(use.getPublicType()==2||use.getPublicType()==3)){
|
|
|
in.setPublicType(1);
|
|
|
PublicExamine pe=new PublicExamine();
|
|
|
pe.setPrid(in.getId());
|
|
|
@@ -333,7 +340,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicExamineMapper.updatePrid(pe);
|
|
|
}
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
- //新增修改日志
|
|
|
+
|
|
|
//重新发起
|
|
|
addPublicReleaseLog(my,in,in.getUserNames(),date,uses);
|
|
|
}else {
|