|
|
@@ -1003,7 +1003,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}else if (e.getProcessStatus()==2){
|
|
|
for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
- if(ap.getType()==2)str=str.append(ap.getReviewerName()+",");
|
|
|
+ if(ap.getType()==4)str=str.append(ap.getReviewerName()+",");
|
|
|
}
|
|
|
}
|
|
|
e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
@@ -1138,55 +1138,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
addpublicLog(id, status, "无需二级审核直接通过");
|
|
|
}else {
|
|
|
- //需要审核的情况下,看是否有审核通过
|
|
|
- List<outPublicReleaseLog> outPublicReleaseLogs = publicReleaseLogMapper.listPublicReleaseLog(use.getId(), null);
|
|
|
- //先看有没有驳回
|
|
|
- int reject = 0;
|
|
|
- //标记审核
|
|
|
- AtomicInteger flag = new AtomicInteger();
|
|
|
- List<outPublicReleaseLog> collect = outPublicReleaseLogs.stream().filter(e -> e.getStatus() == 0 || e.getStatus() == 4).collect(Collectors.toList());
|
|
|
- //没有的的情况下看有没有审核 通过
|
|
|
- long time;
|
|
|
- if (collect.isEmpty()) {
|
|
|
- time = 0;
|
|
|
- } else {
|
|
|
- time = collect.stream()
|
|
|
- .mapToLong(e -> e.getCreateTime().getTime())
|
|
|
- .max().orElse(0L);
|
|
|
- }
|
|
|
- //获取驳回或者撤销后的列表
|
|
|
- if(!outPublicReleaseLogs.isEmpty()){
|
|
|
- List<outPublicReleaseLog> collect1 = outPublicReleaseLogs.stream()
|
|
|
- .filter(e -> e !=null&&e.getCreateTime().getTime() > time).collect(Collectors.toList());
|
|
|
- if (!collect1.isEmpty()) {
|
|
|
- Set<String> aidSet = collect1.stream()
|
|
|
- .map(outPublicReleaseLog::getAid)
|
|
|
- .collect(Collectors.toSet());
|
|
|
-
|
|
|
- boolean hasMatchingAid = outPublicReleaseLogs.stream()
|
|
|
- .map(outPublicReleaseLog::getAid)
|
|
|
- .anyMatch(aidSet::contains);
|
|
|
-
|
|
|
- if (hasMatchingAid) {
|
|
|
- flag.set(1);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- //有审核的情况下可以直接跳过
|
|
|
- if (flag.get() == 1) {
|
|
|
- p.setProcessStatus(3);
|
|
|
- //如果是协单公出主公出,在审核通过
|
|
|
- if (use.getAssist()==1){
|
|
|
- pushPublicReleaseAssist(use, p, date, a);
|
|
|
- }else if (use.getAssist()==0){
|
|
|
- publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
|
|
|
- }
|
|
|
- addpublicLog(use.getId(), status, "审核人已审核,跳过二级审核");
|
|
|
- }else {
|
|
|
p.setStatus(1);
|
|
|
p.setProcessStatus(2);
|
|
|
- }
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
str=str.append(remarks);
|
|
|
@@ -2313,18 +2266,23 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
//判定是否是上级审核人
|
|
|
boolean myFlag = false;
|
|
|
+ List<AdminPublicReviewerBo> collect = new ArrayList<>();
|
|
|
+ if (out.getProcessStatus()==0||out.getProcessStatus()==1){
|
|
|
+ collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ }else if (out.getProcessStatus()==2){
|
|
|
+ collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
|
|
|
+ }
|
|
|
//如果是审核人可以查看
|
|
|
- List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
- for (AdminPublicReviewerBo e : collect) {
|
|
|
- if (e.getReviewerId().equals(aid)){
|
|
|
- flag=true;
|
|
|
- if (out.getType()==0){
|
|
|
- flag2=true;
|
|
|
- }
|
|
|
- myFlag=true;
|
|
|
- break;
|
|
|
+ for (AdminPublicReviewerBo e : collect) {
|
|
|
+ if (e.getReviewerId().equals(aid)){
|
|
|
+ flag=true;
|
|
|
+ if (out.getType()==0){
|
|
|
+ flag2=true;
|
|
|
}
|
|
|
+ myFlag=true;
|
|
|
+ break;
|
|
|
}
|
|
|
+ }
|
|
|
//判定是否是上级审核状态
|
|
|
if((out.getPublicType()==0|| out.getPublicType()==2)&&
|
|
|
(out.getTechStartProcess()==0|| out.getTechStartProcess()==2)&&
|
|
|
@@ -2497,10 +2455,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
// }
|
|
|
} else {
|
|
|
//业务公出,且协单审核完成?
|
|
|
- List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ List<AdminPublicReviewerBo> collect=new ArrayList<>();
|
|
|
+ if (out.getProcessStatus()==0||out.getProcessStatus()==1){
|
|
|
+ collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ }else {
|
|
|
+ collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
|
|
|
+ }
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
str.append(e.getReviewerName()+",");
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|