|
|
@@ -997,8 +997,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
){
|
|
|
StringBuffer str =new StringBuffer();
|
|
|
adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
- for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
- if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
|
|
|
+ if (e.getProcessStatus()==0||e.getProcessStatus()==1){
|
|
|
+ for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
+ if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
|
|
|
+ }
|
|
|
+ }else if (e.getProcessStatus()==2){
|
|
|
+ for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
+ if(ap.getType()==2)str=str.append(ap.getReviewerName()+",");
|
|
|
+ }
|
|
|
}
|
|
|
e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
}else if (e.getType()==0&&e.getAssistProcess()==2){
|
|
|
@@ -1143,25 +1149,30 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
long time;
|
|
|
if (collect.isEmpty()) {
|
|
|
time = 0;
|
|
|
-
|
|
|
} else {
|
|
|
time = collect.stream()
|
|
|
.mapToLong(e -> e.getCreateTime().getTime())
|
|
|
.max().orElse(0L);
|
|
|
}
|
|
|
//获取驳回或者撤销后的列表
|
|
|
- Stream<outPublicReleaseLog> outPublicReleaseLogStream = outPublicReleaseLogs.stream().filter(e -> e.getCreateTime().getTime() > time);
|
|
|
-
|
|
|
- outPublicReleaseLogStream.forEach(e -> {
|
|
|
- outPublicReleaseLogs.stream().forEach(e1 -> {
|
|
|
- if (e1.getAid().equals(e.getAid())) {
|
|
|
+ if(!outPublicReleaseLogs.isEmpty()){
|
|
|
+ List<outPublicReleaseLog> collect1 = outPublicReleaseLogs.stream().filter(e -> 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.setStatus(2);
|
|
|
p.setProcessStatus(3);
|
|
|
//如果是协单公出主公出,在审核通过
|
|
|
if (use.getAssist()==1){
|