|
@@ -237,24 +237,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
str2.append("限定项目所属人营销员").append(my.getName()).append("于")
|
|
str2.append("限定项目所属人营销员").append(my.getName()).append("于")
|
|
|
.append(start).append("至").append(end).append("公出你的企业[").append(u.getNickname()).append("]请悉知!");
|
|
.append(start).append("至").append(end).append("公出你的企业[").append(u.getNickname()).append("]请悉知!");
|
|
|
sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
|
|
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);
|
|
|
}
|
|
}
|
|
|
- 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);
|
|
|
|
|
- sendEmailAndNoticeAndSoucket(u.getAid(), 3, str2.toString());
|
|
|
|
|
- status.set(0);
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}else {
|
|
}else {
|
|
|
users.forEach(u->{
|
|
users.forEach(u->{
|
|
|
if (!u.getAid().equals(my.getId())){
|
|
if (!u.getAid().equals(my.getId())){
|
|
|
- StringBuffer str2=new StringBuffer();
|
|
|
|
|
- str2=str2.append(my.getName()).append("计划公出您的企业").append(u.getNickname())
|
|
|
|
|
- .append(",").append(formatDate).append("【小程序端广播提示】");
|
|
|
|
|
- sendNoticeAndSoucket(u.getAid(),3,str2.toString());
|
|
|
|
|
|
|
+ addNoticeAndSoucket(my, u, formatDate);
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|
|
@@ -277,6 +274,13 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
return map;
|
|
return map;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private void addNoticeAndSoucket(AdminListBo my, User u, String formatDate) {
|
|
|
|
|
+ StringBuffer str2=new StringBuffer();
|
|
|
|
|
+ str2=str2.append(my.getName()).append("计划公出您的企业").append(u.getNickname())
|
|
|
|
|
+ .append(",").append(formatDate).append("【小程序端广播提示】");
|
|
|
|
|
+ sendNoticeAndSoucket(u.getAid(),3,str2.toString());
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private String getString(AdminListBo my, CheckOrderNoOut data) {
|
|
private String getString(AdminListBo my, CheckOrderNoOut data) {
|
|
|
String amountName="";
|
|
String amountName="";
|
|
|
String amountType="";
|
|
String amountType="";
|