Explorar o código

协单审核修改

anderx hai 1 ano
pai
achega
8779a3f08b

+ 12 - 4
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -872,7 +872,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			//营销员审核
 		}else if (examineType==1){
 			//通知公出人切换成公出人审核人
-			a=adminMapper.selectByPrimaryKey(a.getReviewer());
+			List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(a.getId());
+			adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
+
 			if (status==2){
 				//审核通过
 				str=str.append("同意公出我的企业,").append(remarks);
@@ -895,9 +897,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				}
 				if (x==publicExamines.size()){
 					p.setPublicType(2);
-					flag=true;
 				}
 				addpublicLog(id, status, str.toString());
+				//将信息发送给审核人
+				for (AdminPublicReviewerBo adminPublicReviewerBo : adminPublicReviewerBos) {
+					sendNoticeAndSoucket(adminPublicReviewerBo.getReviewerId(),status,content.toString());
+				}
+
 			}else if (status==0){//审核驳回
 				//切换通知人公出负责人
 				a=publicAdmin;
@@ -1009,12 +1015,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				count++;
 			}
 		}
+		if (mianUse.getStatus()==1){
+			addpublicLog(mianUse.getId(), status, remarks);
+		}
 		if(count==newList.size()){
 			PublicRelease newPublic2=new PublicRelease();
 			newPublic2.setId(mianUse.getId());
 			newPublic2.setStatus(2);
 			publicReleaseMapper.update(newPublic2);
-			addpublicLog(mianUse.getId(), status, remarks);
 		}
 		sendNoticeAndSoucket(mianUse.getAid(),status,content.toString());
 		return 1;
@@ -1544,7 +1552,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			}
 			if (out.getType()==0||out.getType()==1||out.getType()==2){
 				if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
-				if (out.getAssistProcess()==0||out.getAssistProcess()==1){
+				if (out.getAssistProcess()==0||out.getAssistProcess()==1||out.getAssistProcess()==2){
 					List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
 					for (AdminPublicReviewerBo e : collect) {
 						if (e.getReviewerId().equals(aid)){