首页 发现 帮助
登录
ssy
/
newcpms
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

LY 专项培训

ly 3 年之前
父节点
3ccb3d850e
当前提交
64fdba379e
共有 2 个文件被更改，包括 45 次插入 和 13 次删除
分列视图 显示文件统计
  1. 19 7
      master/src/main/java/com/ruoyi/common/thread/Trainning/PlanStudyMailThread.java
  2. 26 6
      master/src/main/java/com/ruoyi/project/training/spec/controller/TStPlanController.java

+ 19 - 7
master/src/main/java/com/ruoyi/common/thread/Trainning/PlanStudyMailThread.java
查看文件 

@@ -12,9 +12,9 @@ public class PlanStudyMailThread implements Runnable{
 
     private String username;
 
     private String usernameEN;
 
     private TStPlan tStPlan;
 
-    private String sendType;
 
+    private int sendType;
 
 
-    public PlanStudyMailThread(IMailService mailService, String email, String username, String usernameEN, TStPlan tStPlan, String sendType) {
 
+    public PlanStudyMailThread(IMailService mailService, String email, String username, String usernameEN, TStPlan tStPlan, int sendType) {
 
         this.mailService = mailService;
 
         this.email = email;
 
         this.username = username;
 
@@ -32,6 +32,16 @@ public class PlanStudyMailThread implements Runnable{
 
      * 发送邮件
 
      */
 
     public void sendMail() {
 
+        String call = "学员";
 
+        String studyState = "已完成";
 
+        if (sendType == 2){
 
+            call = "导师";
 
+            studyState = "学员已反馈";
 
+        }else if (sendType == 3){
 
+            studyState = "导师已拒绝";
 
+        }else if (sendType == 1){
 
+
 
+        }
 
         //写html开始内容
 
         String start = "<!DOCTYPE html><html><head><meta charset=\"utf-8\"><title></title></head><body><div style=\"background-color:#ECECEC; padding: 35px;\">" +
 
                 "<table cellpadding=\"0\" align=\"center\"" +
 
@@ -42,12 +52,12 @@ public class PlanStudyMailThread implements Runnable{
 
         String prime = "";
 
         String center = "<tr><td><div style=\"padding:25px 35px 40px; background-color:#fff;\"><h2 style=\"margin: 5px 0px; \">" +
 
                 "<font color=\"#333333\" style=\"line-height: 20px; \"><font style=\"line-height: 22px; \" size=\"4\">" +
 
-                "亲爱的导师 username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
 
+                "亲爱的call username</font><br><font style=\"line-height: 22px; \" size=\"4\">" +
 
                 "Dear usernameEN</font></font></h2>" +
 
-                "<p>您的培训计划已完成：<br>" +
 
+                "<p>您的培训计划有新状态：<br>" +
 
                 "You have a new to-do task:<br>" +
 
                 "培训内容：<b>plantName</b><br>" +
 
-                "学习状态：<b>已完成</b><br>" +
 
+                "学习状态：<b>studyState</b><br>" +
 
                 "学员：<b>staffName</b><br>" +
 
                 "请登录<a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/training/spec/plan\">CPMS管理系统</a>查看。<br>" +
 
                 "Please log in the <a href=\"https://cpms.basf-ypc.net.cn/cpms/index.html#/training/spec/plan\">CPMS</a> to handle it.</p>" +
 
@@ -59,13 +69,15 @@ public class PlanStudyMailThread implements Runnable{
 
         String one = center.replaceFirst("username", username);
 
         String two = one.replaceFirst("usernameEN", usernameEN);
 
         String three = two.replaceFirst("plantName", tStPlan.getPlantName());
 
-        String seven = three.replaceFirst("staffName", tStPlan.getStaffName());
 
+        String four = three.replaceFirst("call",call);
 
+        String five = four.replaceFirst("studyState",studyState);
 
+        String seven = five.replaceFirst("staffName", tStPlan.getStaffName());
 
         String result = seven.replaceFirst("date", String.valueOf(new Date()));
 
         prime = prime + result;
 
         //写html结尾内容
 
         String end = "</tbody></table></div></body></html>";
 
         //拼接html
 
         String html = start + prime + end;
 
-        mailService.sendHtmlMail(email, "CPMS：您的培训计划已完成 CPMS:Your training program is complete (" + tStPlan.getPlantName() + ")", html);
 
+        mailService.sendHtmlMail(email, "CPMS：您的培训计划"+ studyState +" (" + tStPlan.getPlantName() + ")", html);
 
     }
 
 }

+ 26 - 6
master/src/main/java/com/ruoyi/project/training/spec/controller/TStPlanController.java
查看文件 

@@ -266,22 +266,42 @@ public class TStPlanController extends BaseController
 
     {
 
         //发送邮件
 
         try {
 
-            //已完成
 
-            if (tStPlan.getStudyState().equals("1")){
 
-                List<TStSuccessor> successorList = stSuccessorMapper.selectMentorListByStaffId(tStPlan.getStaffId());
 
+            TStPlan mailStPlan = tStPlanService.selectTStPlanById(tStPlan.getId());
 
+            if (tStPlan.getStudyState().equals("2")){//待导师确认
 
+                List<TStSuccessor> successorList = stSuccessorMapper.selectMentorListByStaffId(mailStPlan.getStaffId());
 
                 if (successorList.size() > 0) {
 
                     TStSuccessor mentor = successorList.get(0);
 
-                    SysUser mt = sysUserService.selectUserByStaffId(mentor.getStaffId());
 
+                    SysUser mt = sysUserService.selectUserByStaffId(mentor.getMentorStaffId());
 
                     String email = mt.getEmail();
 
                     String username = mt.getNickName();
 
                     String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
 
                     logger.info("email:" + email);
 
                     logger.info("username:" + username);
 
-                    PlanStudyMailThread sendEmailThead = new PlanStudyMailThread(mailService,email, username,usernameEN, tStPlan, "");
 
+                    PlanStudyMailThread sendEmailThead = new PlanStudyMailThread(mailService,email, username,usernameEN, mailStPlan, 2);
 
+                    Thread t = new Thread(sendEmailThead);
 
+                    t.start();
 
+                }
 
+            }else if (tStPlan.getStudyState().equals("3")) { // 拒绝
 
+                    SysUser xs = sysUserService.selectUserByStaffId(mailStPlan.getStaffId());
 
+                    String email = xs.getEmail();
 
+                    String username = xs.getNickName();
 
+                    String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
 
+                    logger.info("email:" + email);
 
+                    logger.info("username:" + username);
 
+                    PlanStudyMailThread sendEmailThead = new PlanStudyMailThread(mailService,email, username,usernameEN, mailStPlan, 3);
 
+                    Thread t = new Thread(sendEmailThead);
 
+                    t.start();
 
+            }else if (tStPlan.getStudyState().equals("1")) { //完成
 
+                    SysUser xs = sysUserService.selectUserByStaffId(mailStPlan.getStaffId());
 
+                    String email = xs.getEmail();
 
+                    String username = xs.getNickName();
 
+                    String usernameEN = PinyinHelper.convertToPinyinString(username, " ", PinyinFormat.WITHOUT_TONE);
 
+                    logger.info("email:" + email);
 
+                    logger.info("username:" + username);
 
+                    PlanStudyMailThread sendEmailThead = new PlanStudyMailThread(mailService,email, username,usernameEN, mailStPlan, 1);
 
                     Thread t = new Thread(sendEmailThead);
 
                     t.start();
 
                 }
 
-            }
 
         }catch (Exception e) {
 
             logger.error("邮件发送失败" + JSON.toJSONString(e));
 
         }