Browse Source

审核BUG修复

anderx 1 year ago
parent
commit
35c4e48c75

+ 10 - 11
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -834,7 +834,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public int pushExaminePublicRelease(Integer id, Integer status, String remarks,Integer examineType) {
 		PublicRelease p=new PublicRelease();
 		Date date =new Date();
-		boolean flag=false;
 		String aid=TokenManager.getAdminId();
 		p.setId(id);
 		PublicRelease use=publicReleaseMapper.queryById(id);
@@ -888,14 +887,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			p.setAuditInfo(str.toString());
 			p.setAuditTime(date);
 			p.setRejectName(ad.getName());
-			flag=true;
+			sendNoticeAndSoucket(a.getId(),status,content.toString());
 			//营销员审核
 		}else if (examineType==1){
 			//通知公出人切换成公出人审核人
-			List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(a.getId());
-			adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
 
 			if (status==2){
+			List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(a.getId());
+			adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
 				//审核通过
 				str=str.append("同意公出我的企业,").append(remarks);
 				content=content.append("已通过审核,请尽快审核。");
@@ -934,7 +933,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				p.setAuditInfo(str.toString());
 				p.setRejectName(ad.getName());
 				addpublicLog(id, 0, str.toString());
-				flag=true;
+				sendNoticeAndSoucket(a.getId(),status,content.toString());
 			}
 		}else if (examineType==2){
 			//通知公出人切换成公出人审核人
@@ -960,10 +959,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				}
 				if (x==publicExamines.size()){
 					p.setTechStartProcess(2);
-					flag=true;
+					List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(a.getId());
+					adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
+					for (AdminPublicReviewerBo adminPublicReviewerBo : adminPublicReviewerBos) {
+						sendNoticeAndSoucket(adminPublicReviewerBo.getReviewerId(),status,content.toString());
+					}
 				}
 				addpublicLog(id, status, str.toString());
-
 			}else if (status==0){
 				//审核驳回
 				//切换通知人公出负责人
@@ -975,13 +977,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				p.setAuditInfo(str.toString());
 				p.setRejectName(ad.getName());
 				addpublicLog(id, 0, str.toString());
-				flag=true;
+				sendNoticeAndSoucket(a.getId(),status,content.toString());
 			}
 		}
 		AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-		if (flag){
-			sendNoticeAndSoucket(a.getId(),status,content.toString());
-		}
 		if (p.getStatus()!=null||p.getPublicType()!=null||p.getTechStartProcess()!=null){
 			publicReleaseMapper.update(p);
 			updateAdminUserCountPublicRelease(use.getAid(),use.getReleaseStart());