Merge remote-tracking branch 'origin/matser' into matser

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/PersonnelTrainJob.java

@@ -71,7 +71,7 @@ public class PersonnelTrainJob extends BaseJob2 {
                     String fuzeren = train.get("bian_zhi_ren_").toString();
                     receiver.add(fuzeren);
                     String title = "培训准备通知";
-                    String content = "您有一个主题为《"+peiXunNeiRong+"》的培训将于 "+starDate+" 开始，请及时前往培训管理页面完善培训信息！";
+                    String content = "您有一个主题为【"+peiXunNeiRong+"】的培训将于 "+starDate+" 开始，请及时前往培训管理页面完善培训信息！";
                     this.sendCalendarRemind(id,fuzeren,content,starDate,title);
                     MessageQueueProductorUtil.send("PersonnelTrainJob", "system" , "inner" , receiver,null , title, content, null, null, null);
                 }
@@ -105,14 +105,11 @@ public class PersonnelTrainJob extends BaseJob2 {
                         this.sendCalendarByDone(id,str,name,peiXunNeiRong,starDate,endDate,peiXunDiDian,nameStr.toString());
                     }
 
-                    String content = "<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
-                            "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" +
-                            "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<strong>&nbsp;&nbsp;&nbsp;培训通知</strong></p >" +
-                            "<p>&nbsp;&nbsp;&nbsp;<br/></p ><p><strong>一、培训主题:</strong></p><p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"+peiXunNeiRong+"</p >" +
-                            "<p><strong>二、时间安排:</strong></p ><p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;开始时间："+starDate+"&nbsp;&nbsp;</p >" +
-                            "<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;结束时间："+endDate+"</p ><p><strong>三、培训地点："+peiXunDiDian+"</strong></p >" +
-                            "<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"+peiXunDiDian+"</p ><p><strong>四、参加人员：</strong></p >" +
-                            "<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"+nameStr+"</p ><p><br style=\"text-wrap: wrap;\"/></p ><p><br/></p >";
+                    String content = "<p style=\"font-weight: 600; font-size: 24px; text-align: center; margin-bottom: 20px;\"><strong>培训通知</strong></p>" +
+                            "<p><strong>一、培训主题</strong></p><p style=\"margin: 0 0 10px 32px;\">"+peiXunNeiRong+"</p><p><strong>二、时间安排</strong></p>" +
+                            "<p style=\"margin-left: 32px;\">开始时间："+starDate+"</p><p style=\"margin: 0 0 10px 32px\">结束时间："+endDate+"</p>" +
+                            "<p><strong>三、培训地点</strong></p><p style=\"margin: 0 0 10px 32px\">"+peiXunDiDian+"</p><p><strong>四、参加人员</strong></p>" +
+                            "<p style=\"margin: 0 0 10px 32px\">"+nameStr+"</p>";
 
                     NewsPo newsPo = new NewsPo();
                     newsPo.setAuthor(userName);