|
|
@@ -34,10 +34,8 @@ import org.springframework.web.socket.TextMessage;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.ParseException;
|
|
|
import java.util.*;
|
|
|
-import java.util.concurrent.atomic.AtomicInteger;
|
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
|
import java.util.stream.Collectors;
|
|
|
-import java.util.stream.Stream;
|
|
|
|
|
|
@Service
|
|
|
public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper> implements PublicReleaseService {
|
|
|
@@ -1105,7 +1103,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
//上级审核
|
|
|
if(examineType==0){
|
|
|
p.setStatus(status);
|
|
|
- if(use.getProcessStatus()==0||use.getProcessStatus()==1){
|
|
|
if (status==0){
|
|
|
addpublicLog(id, status, remarks);
|
|
|
str=str.append("驳回,");
|
|
|
@@ -1143,55 +1140,15 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
p.setStatus(1);
|
|
|
p.setProcessStatus(2);
|
|
|
}else if (use.getProcessStatus()==2){
|
|
|
- //需要审核的情况下,看是否有审核通过
|
|
|
- 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);
|
|
|
- }
|
|
|
- //获取驳回或者撤销后的列表
|
|
|
- Stream<outPublicReleaseLog> outPublicReleaseLogStream = outPublicReleaseLogs.stream().filter(e -> e.getCreateTime().getTime() > time);
|
|
|
- outPublicReleaseLogStream.forEach(e -> {
|
|
|
- outPublicReleaseLogs.stream().forEach(e1 -> {
|
|
|
- if (e1.getAid().equals(e.getAid())) {
|
|
|
- flag.set(1);
|
|
|
- }
|
|
|
- });
|
|
|
- });
|
|
|
- //有审核的情况下可以直接跳过
|
|
|
- if (flag.get() == 1) {
|
|
|
- p.setStatus(2);
|
|
|
- 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 {
|
|
|
- adminPublicReviewerBos.forEach(e -> {
|
|
|
- if(e.getAid()==aid){
|
|
|
- p.setStatus(2);
|
|
|
- p.setProcessStatus(3);
|
|
|
- }
|
|
|
- });
|
|
|
+ p.setStatus(2);
|
|
|
+ p.setProcessStatus(3);
|
|
|
+ //如果是协单公出主公出,在审核通过
|
|
|
+ if (use.getAssist()==1){
|
|
|
+ pushPublicReleaseAssist(use, p, date, a);
|
|
|
+ }else if (use.getAssist()==0){
|
|
|
+ publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
str=str.append(remarks);
|
|
|
@@ -1204,10 +1161,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (use.getProcessStatus()==1&&evaluateType==1){
|
|
|
addUserSuperEvaluate(remarks, outPublicReleaseDetails, date);
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
//营销员审核
|
|
|
}else if (examineType==1){
|
|
|
//通知公出人切换成公出人审核人
|