|
|
@@ -394,10 +394,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
log.setStatus(PublicReleaseLog.states.xg.getCode());
|
|
|
in.setUpdateStatus(1);
|
|
|
//如果是业务切公出则撤销营销审核与审核人
|
|
|
- if(in.getType()==1&&use.getType()==0){
|
|
|
- in.setPublicType(0);
|
|
|
- publicExamineMapper.deletePrid(in.getId());
|
|
|
- }
|
|
|
+ pushUpdateType(in,use);
|
|
|
+
|
|
|
//如果是业务公出,切审核状态为其他,则重置审核
|
|
|
if(in.getType()==0&&(use.getPublicType()==2||use.getPublicType()==3)){
|
|
|
in.setPublicType(1);
|
|
|
@@ -431,6 +429,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ private void pushUpdateType(InputPublicRelease in, PublicRelease use) {
|
|
|
+ //营销切换成技术
|
|
|
+ if(use.getType()==0&&in.getType()==1){
|
|
|
+ in.setPublicType(0);
|
|
|
+ }
|
|
|
+ if(use.getType()==1&&in.getType()==0){
|
|
|
+ in.setTechStartProcess(0);
|
|
|
+ }
|
|
|
+ publicExamineMapper.deletePrid(in.getId());
|
|
|
+ }
|
|
|
+
|
|
|
private List<User> pushPublicReleaseDetails(List<String> split, List<OutPublicReleaseDetails> prList, PublicRelease use, InputPublicRelease in) {
|
|
|
//先删除,再修改个,再新增,有利于减少计算
|
|
|
deletePRD(split,prList);
|