Sfoglia il codice sorgente

新增行政公出企业通知

anderx 11 mesi fa
parent
commit
02d409f498

+ 33 - 18
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -274,31 +274,46 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			AtomicReference<Integer> status= new AtomicReference<>(1);
 			String formatDate = DateUtils.formatDate(in.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
 			//业务公出
-			if (in.getType()==0){
+			if (in.getType()==0||in.getType()==2){
 				//不是业务员
 				if (my.getPublicPurview()==0){
                     for (User u : users) {
 						//不是自己的客户
-                        if (!u.getAid().equals(my.getId())) {
-							List<RestrictProject> list = restrictProjectMapper.selectListByParam(new InputRestrictProject(u.getId(), my.getId()));
+						if (!u.getAid().equals(my.getId())) {
 							StringBuilder str2 = new StringBuilder();
 							Admin admin = adminMapper.queryById(u.getAid());
-							if (!list.isEmpty()){
-								String start = DateUtils.formatDate(in.getReleaseStart(), AFTConstants.MMDDHHMM);
-								String end = DateUtils.formatDate(in.getReleaseEnd(), AFTConstants.MMDDHHMM);
-								str2.append("限定项目所属人营销员").append(my.getName()).append("于")
-										.append(start).append("至").append(end).append("公出你的企业[").append(u.getNickname()).append("]请悉知!");
-								sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
-							}else {
-								str2.append(my.getName()).append("(需审核),准备公出您的企业")
-										.append("[").append(u.getNickname()).append("]。");
-								addPublicExamine(in.getId(), admin);
-								if (in.getPublicType() == null || in.getPublicType() == 0) in.setPublicType(1);
-								//审核通知
-								pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
-								status.set(0);
+							//业务公出限定项目直接公出,不是业务项目审核公出
+							if(in.getType()==0){
+									List<RestrictProject> list = restrictProjectMapper.selectListByParam(new InputRestrictProject(u.getId(), my.getId()));
+									if (!list.isEmpty()){
+										String start = DateUtils.formatDate(in.getReleaseStart(), AFTConstants.MMDDHHMM);
+										String end = DateUtils.formatDate(in.getReleaseEnd(), AFTConstants.MMDDHHMM);
+										str2.append("限定项目所属人营销员").append(my.getName()).append("于")
+												.append(start).append("至").append(end).append("公出你的企业[").append(u.getNickname()).append("]请悉知!");
+										sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
+									}else {
+										str2.append(my.getName()).append("(需审核),准备公出您的企业")
+												.append("[").append(u.getNickname()).append("]。");
+										addPublicExamine(in.getId(), admin);
+										if (in.getPublicType() == null || in.getPublicType() == 0) in.setPublicType(1);
+										//审核通知
+										pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
+										status.set(0);
+									}
+									//行政公出通知
+							}else if (in.getType()==2){
+									str2.append(my.getName()).append(",准备[行政公出]您的企业")
+											.append("[").append(u.getNickname()).append("]。");
+									addPublicExamine(in.getId(), admin);
+									if (in.getPublicType() == null || in.getPublicType() == 0) in.setPublicType(1);
+									//审核通知
+									pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
+									status.set(0);
 							}
-                        }
+						}
+
+
+
                     }
                 }else {
 					users.forEach(u->{