|
@@ -70,7 +70,7 @@ public class PersonnelTrainJob extends BaseJob2 {
|
|
|
receiver.add(fuzeren);
|
|
receiver.add(fuzeren);
|
|
|
String title = "【"+ peiXunNeiRong +"】的培训准备通知";
|
|
String title = "【"+ peiXunNeiRong +"】的培训准备通知";
|
|
|
String content = "您有一个主题为【"+peiXunNeiRong+"】的培训将于 "+starDate+" 开始,请及时前往培训管理页面完善培训信息!";
|
|
String content = "您有一个主题为【"+peiXunNeiRong+"】的培训将于 "+starDate+" 开始,请及时前往培训管理页面完善培训信息!";
|
|
|
- this.sendCalendarRemind(id,fuzeren,content,starDate,title);
|
|
|
|
|
|
|
+ this.sendCalendarRemind(id,"t_rypxcjb",fuzeren,content,starDate,title);
|
|
|
MessageQueueProductorUtil.send("PersonnelTrainJob", "system" , "inner" , receiver,null , title, content, null, null, null);
|
|
MessageQueueProductorUtil.send("PersonnelTrainJob", "system" , "inner" , receiver,null , title, content, null, null, null);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -113,7 +113,7 @@ public class PersonnelTrainJob extends BaseJob2 {
|
|
|
|
|
|
|
|
for (String str : ids){
|
|
for (String str : ids){
|
|
|
String name = partyEmployeeRepository.get(str).getName();
|
|
String name = partyEmployeeRepository.get(str).getName();
|
|
|
- this.sendCalendarByDone(id,str,name,peiXunNeiRong,starDate,endDate,peiXunDiDian,nameStr.toString());
|
|
|
|
|
|
|
+ this.sendCalendarByDone(id,"t_rypxcjb",str,name,peiXunNeiRong,starDate,endDate,peiXunDiDian,nameStr.toString());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
String content = "<p style=\"font-weight: 600; font-size: 24px; text-align: center; margin-bottom: 20px;\"><strong>培训通知</strong></p>" +
|
|
String content = "<p style=\"font-weight: 600; font-size: 24px; text-align: center; margin-bottom: 20px;\"><strong>培训通知</strong></p>" +
|
|
@@ -143,9 +143,10 @@ public class PersonnelTrainJob extends BaseJob2 {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 培训提醒
|
|
// 培训提醒
|
|
|
- private void sendCalendarRemind(String id,String userId,String peiXunNeiRong,String starDate,String title){
|
|
|
|
|
|
|
+ private void sendCalendarRemind(String id,String dataInfo, String userId,String peiXunNeiRong,String starDate,String title){
|
|
|
PartyUserCalendarPo calendarPo = new PartyUserCalendarPo();
|
|
PartyUserCalendarPo calendarPo = new PartyUserCalendarPo();
|
|
|
calendarPo.setDataSourceId(id);
|
|
calendarPo.setDataSourceId(id);
|
|
|
|
|
+ calendarPo.setDataInfo(dataInfo);
|
|
|
calendarPo.setUserId(userId);
|
|
calendarPo.setUserId(userId);
|
|
|
calendarPo.setTitle(title);
|
|
calendarPo.setTitle(title);
|
|
|
calendarPo.setContent(peiXunNeiRong);
|
|
calendarPo.setContent(peiXunNeiRong);
|
|
@@ -158,9 +159,10 @@ public class PersonnelTrainJob extends BaseJob2 {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//培训通知
|
|
//培训通知
|
|
|
- private void sendCalendarByDone(String id,String userId,String userName,String peiXunNeiRong,String starDate,String endDate,String didian,String nameStr){
|
|
|
|
|
|
|
+ private void sendCalendarByDone(String id,String dataInfo, String userId,String userName,String peiXunNeiRong,String starDate,String endDate,String didian,String nameStr){
|
|
|
PartyUserCalendarPo calendarPo = new PartyUserCalendarPo();
|
|
PartyUserCalendarPo calendarPo = new PartyUserCalendarPo();
|
|
|
calendarPo.setDataSourceId(id);
|
|
calendarPo.setDataSourceId(id);
|
|
|
|
|
+ calendarPo.setDataInfo(dataInfo);
|
|
|
calendarPo.setUserId(userId);
|
|
calendarPo.setUserId(userId);
|
|
|
calendarPo.setUserName(userName);
|
|
calendarPo.setUserName(userName);
|
|
|
calendarPo.setTitle("【"+ peiXunNeiRong +"】的培训通知");
|
|
calendarPo.setTitle("【"+ peiXunNeiRong +"】的培训通知");
|