|
|
@@ -1672,27 +1672,69 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
if (out.getType()==0||out.getType()==1||out.getType()==2){
|
|
|
if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
+ //判定是否是上级审核人
|
|
|
+ boolean myFlag = false;
|
|
|
//如果是审核人可以查看
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
if (e.getReviewerId().equals(aid)){
|
|
|
flag=false;
|
|
|
flag2=true;
|
|
|
+ myFlag=true;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- //判定是否是可审核状态
|
|
|
-
|
|
|
- //添加协单审核人可以查看
|
|
|
- List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
|
- for (PublicRelease e : publicReleases) {
|
|
|
- List<AdminPublicReviewerBo> sonAPRList = adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
- List<AdminPublicReviewerBo> collect2 = sonAPRList.stream().filter(e2 -> e2.getType() == 1).collect(Collectors.toList());
|
|
|
- for (AdminPublicReviewerBo e2 : collect2) {
|
|
|
- if (e2.getReviewerId().equals(aid)){
|
|
|
- flag=false;
|
|
|
-// flag2=true;
|
|
|
- break;
|
|
|
+ //判定是否是上级审核状态
|
|
|
+ if((out.getPublicType()==0|| out.getPublicType()==2)&&
|
|
|
+ (out.getTechStartProcess()==0|| out.getTechStartProcess()==2)&&
|
|
|
+ (out.getAssistProcess()==0|| out.getAssistProcess()==1)&&
|
|
|
+ (out.getAssist()==0|| out.getAssist()==1)&& out.getStatus()==1
|
|
|
+ ){
|
|
|
+ if (myFlag){
|
|
|
+ out.setMyExamine(1);
|
|
|
+ }else {
|
|
|
+ out.setMyExamine(0);
|
|
|
+ }
|
|
|
+ }else if(out.getPublicType()==1&&out.getStatus()==1){
|
|
|
+ //他人公出审核
|
|
|
+ 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;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //技术公出营销审核
|
|
|
+ } else if (out.getTechStartProcess()==1&&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)){
|
|
|
+ myExamine=true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (myExamine)out.setMyExamine(1);
|
|
|
+ else out.setMyExamine(0);
|
|
|
+ } else if ((out.getAssistProcess()==2||out.getAssistProcess()==3)&&out.getStatus()==1) {
|
|
|
+ //添加协单审核人可以查看
|
|
|
+ List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
|
+ for (PublicRelease e : publicReleases) {
|
|
|
+ List<AdminPublicReviewerBo> sonAPRList = adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
+ List<AdminPublicReviewerBo> collect2 = sonAPRList.stream().filter(e2 -> e2.getType() == 1).collect(Collectors.toList());
|
|
|
+ for (AdminPublicReviewerBo e2 : collect2) {
|
|
|
+ if (e2.getReviewerId().equals(aid)){
|
|
|
+ flag=false;
|
|
|
+ if (myFlag){
|
|
|
+ out.setMyExamine(1);
|
|
|
+ }else {
|
|
|
+ out.setMyExamine(0);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1713,17 +1755,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}else {
|
|
|
out.setViewPermission(0);
|
|
|
}
|
|
|
- //公出非自己的客户审核列表
|
|
|
- if (!ps.isEmpty()){
|
|
|
- for (PublicExamine p : ps) {
|
|
|
- if (p.getAid().equals(aid)){
|
|
|
- if (p.getStatus()==1)out.setMyExamine(1);
|
|
|
- else out.setMyExamine(0);
|
|
|
- flag=false;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
//处理返回
|
|
|
if(flag){
|
|
|
out=null;
|
|
|
@@ -1755,6 +1787,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 设置审核人
|
|
|
* @param out
|