|
|
@@ -159,9 +159,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(updateName);
|
|
|
addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
|
|
|
if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
|
|
|
- asyncUtils.addNoticAndEmail(NoticeStatus.MENBER_START.getCode(),my.getPublicCarbonCopy()
|
|
|
- ,String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),in.getReleaseStart(),in.getReleaseEnd(),
|
|
|
- userNames));
|
|
|
+ String str2=String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),
|
|
|
+ DateUtils.formatDateYYYYMMddHHmm(in.getReleaseStart()),
|
|
|
+ DateUtils.formatDateYYYYMMddHHmm(in.getReleaseEnd()),
|
|
|
+ userNames);
|
|
|
+ asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(),my.getPublicCarbonCopy()
|
|
|
+ ,str2);
|
|
|
}
|
|
|
return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
|
|
|
}
|
|
|
@@ -440,11 +443,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicExamineMapper.updateByPridSelective(pe);
|
|
|
}
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
- String str=String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),
|
|
|
- DateUtils.formatDateYYYYMMddHHmm(in.getReleaseStart()),
|
|
|
- DateUtils.formatDateYYYYMMddHHmm(in.getReleaseEnd()),
|
|
|
- userNames);
|
|
|
if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
|
|
|
+ String str=String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),
|
|
|
+ DateUtils.formatDateYYYYMMddHHmm(in.getReleaseStart()),
|
|
|
+ DateUtils.formatDateYYYYMMddHHmm(in.getReleaseEnd()),
|
|
|
+ userNames);
|
|
|
asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(),my.getPublicCarbonCopy()
|
|
|
,str);
|
|
|
}
|