Browse Source

新增二级审核

anderx 4 months ago
parent
commit
8283ac8908

+ 34 - 17
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -139,6 +139,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				in.setTechStartProcess(1);
 			}
 		}
+		in.setProcessStatus(1);
 		publicReleaseMapper.insertSelective(in);
 		if (in.getType()==1&&in.getOrderNo()!=null){
 			TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
@@ -1122,6 +1123,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
 				if (adminPublicReviewerBos.isEmpty()){
 					p.setStatus(2);
+					p.setProcessStatus(3);
 					//如果是协单公出主公出,在审核通过
 					if (use.getAssist()==1){
 						pushPublicReleaseAssist(use, p, date, a);
@@ -1141,13 +1143,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					long time;
                     if (collect.isEmpty()) {
                         time = 0;
-                        adminPublicReviewerBos.stream().forEach(e -> {
-                            outPublicReleaseLogs.stream().forEach(e1 -> {
-                                if (e1.getAid().equals(e.getAid())) {
-                                    flag.set(1);
-                                }
-                            });
-                        });
+
                     } else {
 						time = collect.stream()
 								.mapToLong(e -> e.getCreateTime().getTime())
@@ -1155,9 +1151,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					}
 					//获取驳回或者撤销后的列表
 					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);
@@ -1165,8 +1170,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 							publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
 						}
 						addpublicLog(use.getId(), status, "审核人已审核,跳过二级审核");
-                    }
-                    p.setStatus(1);
+                    }else {
+						p.setStatus(1);
+						p.setProcessStatus(2);
+					}
+
                 }
 			}
 			str=str.append(remarks);
@@ -1313,13 +1321,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					long time;
 					if (collect.isEmpty()) {
 						time = 0;
-						adminPublicReviewerBos.stream().forEach(e -> {
-							outPublicReleaseLogs.stream().forEach(e1 -> {
-								if (e1.getAid().equals(e.getAid())) {
-									flag.set(1);
-								}
-							});
-						});
+
 					} else {
 						time = collect.stream()
 								.mapToLong(e -> e.getCreateTime().getTime())
@@ -1327,9 +1329,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					}
 					//获取驳回或者撤销后的列表
 					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);
@@ -1337,8 +1348,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 							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(1);
 				}
 			}
 			str=str.append(remarks);