|
|
@@ -179,6 +179,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
|
//默认上级审核
|
|
|
AtomicReference<Integer> status= new AtomicReference<>(1);
|
|
|
+ String formatDate = DateUtils.formatDate(in.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
|
|
|
Map<String, Object>map=new HashMap<String, Object>();
|
|
|
//不是业务员
|
|
|
if (in.getType()==0){
|
|
|
@@ -203,15 +204,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
users.forEach(u->{
|
|
|
if (!u.getAid().equals(my.getId())){
|
|
|
StringBuffer str2=new StringBuffer();
|
|
|
- str2=str2.append("业务员").append(my.getName()).append("(无需审核),准备公出您的企业");
|
|
|
- str2=str2.append("[").append(u.getNickname()).append("]!!!");
|
|
|
+ str2=str2.append(my.getName()).append("计划公出您的企业").append(u.getNickname())
|
|
|
+ .append(",").append(formatDate).append("【小程序端广播提示】");
|
|
|
sendNoticeAndSoucket(u.getAid(),3,str2.toString());
|
|
|
}
|
|
|
});
|
|
|
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
if (status.get()==1){
|
|
|
pushNoticeAndSoucketAndEmail(my, in, date, a, str, map);
|
|
|
}
|