|
|
@@ -199,26 +199,34 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
|
|
|
private void pushPublicCarbonCopy(InputPublicRelease in, AdminListBo my, String userNames) {
|
|
|
- if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
|
|
|
- String startTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseStart());
|
|
|
- String endTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseEnd());
|
|
|
- //分类 0业务 1技术 2行政 3 技术协单 4 技术助手
|
|
|
- String typeName=null;
|
|
|
- if(in.getType()==0)typeName="业务公出";
|
|
|
- else if(in.getType()==1)typeName="技术公出";
|
|
|
- else if(in.getType()==2)typeName="行政公出";
|
|
|
- String str2=String.format("营销员%s,%s - %s,将公出%s,请知悉!", my.getName(),
|
|
|
- startTime,
|
|
|
- endTime,
|
|
|
- userNames);
|
|
|
- asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(), my.getPublicCarbonCopy()
|
|
|
- ,str2);
|
|
|
- asyncUtils.sendWeChat(my.getPublicCarbonCopy(), in.getId(),
|
|
|
- my.getName(), startTime,
|
|
|
- endTime,
|
|
|
- typeName,
|
|
|
- in.getPlan());
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(my.getId())
|
|
|
+ .stream().filter(e -> e.getType() == 3).collect(Collectors.toList());
|
|
|
+ if (adminPublicReviewerBos.size()>0){
|
|
|
+ for (AdminPublicReviewerBo e : adminPublicReviewerBos) {
|
|
|
+ if (StringUtils.isNotEmpty(e.getReviewerId())){
|
|
|
+ String startTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseStart());
|
|
|
+ String endTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseEnd());
|
|
|
+ //分类 0业务 1技术 2行政 3 技术协单 4 技术助手
|
|
|
+ String typeName=null;
|
|
|
+ if(in.getType()==0)typeName="业务公出";
|
|
|
+ else if(in.getType()==1)typeName="技术公出";
|
|
|
+ else if(in.getType()==2)typeName="行政公出";
|
|
|
+ String str2=String.format("营销员%s,%s - %s,将公出%s,请知悉!", my.getName(),
|
|
|
+ startTime,
|
|
|
+ endTime,
|
|
|
+ userNames);
|
|
|
+ asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(), e.getReviewerId()
|
|
|
+ ,str2);
|
|
|
+ asyncUtils.sendWeChat(e.getReviewerId(), in.getId(),
|
|
|
+ my.getName(), startTime,
|
|
|
+ endTime,
|
|
|
+ typeName,
|
|
|
+ in.getPlan());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -586,14 +594,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
// publicReleaseMapper.updateByPrimaryKeySelective(out);
|
|
|
// }
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
- 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);
|
|
|
- }
|
|
|
+ pushPublicCarbonCopy( in, my, userNames);
|
|
|
//重新发起
|
|
|
addPublicReleaseLog(my, in, in.getUserNames(), date, uses, checkOrderNo);
|
|
|
}
|