|
|
@@ -1694,31 +1694,34 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (myFlag){
|
|
|
out.setMyExamine(1);
|
|
|
}
|
|
|
- }else if(out.getPublicType()==1&&out.getStatus()==1){
|
|
|
+ }else if((out.getPublicType()==1||out.getPublicType()==2)){
|
|
|
//他人公出审核
|
|
|
if (!ps.isEmpty()){
|
|
|
for (PublicExamine p : ps) {
|
|
|
- if (p.getAid().equals(aid)){
|
|
|
- if (p.getStatus()==1)out.setMyExamine(0);
|
|
|
- else out.setMyExamine(1);
|
|
|
- flag=false;
|
|
|
- break;
|
|
|
+ flag=false;
|
|
|
+ if (out.getPublicType()==1&&out.getStatus()==1){
|
|
|
+ if (p.getAid().equals(aid)){
|
|
|
+ if (p.getStatus()==0)out.setMyExamine(1);
|
|
|
+ else out.setMyExamine(0);
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
//技术公出营销审核
|
|
|
- } else if (out.getTechStartProcess()==1&&out.getStatus()==1) {
|
|
|
+ } else if ((out.getTechStartProcess()==1&&out.getTechStartProcess()==2)&&out.getStatus()==1) {
|
|
|
List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(out.getId());
|
|
|
boolean myExamine = false;
|
|
|
for (OutPublicReleaseDetails ord : outPublicReleaseDetails) {
|
|
|
User user = userMapper.selectByPrimaryKey(ord.getUid());
|
|
|
if (user.getAid().equals(aid)){
|
|
|
flag=false;
|
|
|
- myExamine=true;
|
|
|
+ if (out.getTechStartProcess()==1)myExamine=true;
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
if (myExamine)out.setMyExamine(1);
|
|
|
- } else if ((out.getAssistProcess()==2||out.getAssistProcess()==3)&&out.getStatus()==1) {
|
|
|
+ } else if (out.getAssistProcess()==2||out.getAssistProcess()==3||out.getAssistProcess()==4) {
|
|
|
//添加协单审核人可以查看
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
|
for (PublicRelease e : publicReleases) {
|
|
|
@@ -1727,7 +1730,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (AdminPublicReviewerBo e2 : collect2) {
|
|
|
if (e2.getReviewerId().equals(aid)){
|
|
|
flag=false;
|
|
|
- out.setMyExamine(1);
|
|
|
+ if((out.getAssistProcess()==2||out.getAssistProcess()==3)&&
|
|
|
+ out.getStatus()==1
|
|
|
+ ){
|
|
|
+ out.setMyExamine(1);
|
|
|
+ }
|
|
|
break;
|
|
|
}
|
|
|
}
|