|
|
@@ -1482,6 +1482,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}else if(status==2){
|
|
|
content+="已通过审核。";
|
|
|
addpublicLog(id, status, remarks);
|
|
|
+ //通过先修改协单的状态
|
|
|
for (PublicRelease e : publicReleases) {
|
|
|
PublicRelease newPublic2=new PublicRelease();
|
|
|
newPublic2.setId(e.getId());
|
|
|
@@ -2664,7 +2665,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
//业务公出且协单部分审核(看着流程有点问题)
|
|
|
}else if ((out.getType()==0||out.getType()==5)
|
|
|
- && out.getAssistProcess()==2){
|
|
|
+ && (out.getAssistProcess()==2 || out.getAssistProcess()==3)){
|
|
|
//获取技术协单
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
|
List<String> names=new ArrayList<>();
|