feature 代码提交

bs-common/src/main/java/com/rongwei/safecommon/utils/SaveConstans.java

@@ -75,15 +75,19 @@ public class SaveConstans {
 
     }
 
-    public static class NotifyType{
+    public static class NotifyType {
         /**
          * 我的培训
          */
-        public static final String TRAINING="training";
+        public static final String TRAINING = "training";
+        /**
+         * 我的课程
+         */
+        public static final String COURSE = "course";
         /**
          * 培训需求调查表
          */
-        public static final String  TRAININGFORM="trainingform";
+        public static final String TRAININGFORM = "trainingform";
         /**
          * 安全应急
          */
@@ -126,7 +130,9 @@ public class SaveConstans {
         /**
          * 我的培训
          */
-        public static final String TRAIN_NOTIFY_TITLE = "我的培训";
+        public static final String TRAIN_NOTIFY_TITLE = "培训试卷提醒";
+
+        public static final String COURSE_NOTIFY_TITLE = "培训课程提醒";
         /**
          * 培训取消提醒
          */
@@ -159,6 +165,10 @@ public class SaveConstans {
          * 我的培训提醒内容
          */
         public static final String TRAIN_NOTIFY_CONTENT = "%s，培训时间：%tF至%tF";
+        /**
+         * 我的培训课程提醒内容
+         */
+        public static final String COURSE_NOTIFY_CONTENT = "%s，培训时间：%tF至%tF";
         /**
          * 培训取消提醒内容
          */

rw-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/TrainingSendNotifyServiceImpl.java

@@ -29,8 +29,7 @@ import java.util.stream.Collectors;
 
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.*;
 import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.*;
-import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.TRAINING;
-import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.TRAININGFORM;
+import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.*;
 
 /**
  * SendNotifyService class
@@ -200,7 +199,11 @@ public class TrainingSendNotifyServiceImpl implements TrainingSendNotifyService
             CXCommonUtils.sendNotify(TRAIN_NOTIFY_TITLE, String.format(TRAIN_NOTIFY_CONTENT, k.getCoursename(),
                             k.getTrainingstarttime(), k.getTrainingendtimt()), "", new ArrayList<>(v),
                     k.getId(), TRAINING);
+            CXCommonUtils.sendNotify(COURSE_NOTIFY_TITLE, String.format(TRAIN_NOTIFY_CONTENT, k.getCoursename(),
+                            k.getTrainingstarttime(), k.getTrainingendtimt()), "", new ArrayList<>(v),
+                    k.getId(), COURSE);
         });
+
     }
 
     /**

rw-training/training-server/src/main/java/com/rongwei/training/controller/PlanController.java

@@ -11,6 +11,7 @@ import com.rongwei.rwcommon.base.QueryPar;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
+import com.rongwei.safecommon.utils.CXCommonUtils;
 import com.rongwei.training.domain.*;
 import com.rongwei.trainingcommon.sys.service.*;
 import com.rongwei.trainingcommon.sys.service.impl.TrainingSendNotifyServiceImpl;
@@ -22,6 +23,12 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.rongwei.safecommon.utils.SaveConstans.NotifyContent.TRAIN_NOTIFY_CONTENT;
+import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.COURSE_NOTIFY_TITLE;
+import static com.rongwei.safecommon.utils.SaveConstans.NotifyTitle.TRAIN_NOTIFY_TITLE;
+import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.COURSE;
+import static com.rongwei.safecommon.utils.SaveConstans.NotifyType.TRAINING;
+
 @RestController
 @RequestMapping("plan")
 @Slf4j
@@ -45,13 +52,6 @@ public class PlanController {
     @Autowired
     private TrainingSendNotifyServiceImpl sendNotifyService;
 
-    public static final String TRAIN_NOTIFY_TITLE = "我的培训";
-    public static final String TRAIN_NOTIFY_CONTENT = "%s，培训时间：%tF-%tF";
-
-    public static final String CANCEL_TRAIN_TITLE = "培训取消提醒";
-    public static final String CANCEL_TRAIN_CONTENT = "%s已取消";
-
-
     /**
      * 列表
      */
@@ -100,6 +100,16 @@ public class PlanController {
                     if (planPaperList.size() > 1) {
                         return R.errorWithMsg("单一培训计划只可对应一张试卷");
                     }
+                    if(!planCourseList.isEmpty()){
+                        CXCommonUtils.sendNotify(COURSE_NOTIFY_TITLE, String.format(TRAIN_NOTIFY_CONTENT, row.getCoursename(),
+                                        row.getTrainingstarttime(), row.getTrainingendtimt()), "", new ArrayList<>(userIds) ,
+                                row.getId(), COURSE);
+                    }
+                    if(!planPaperList.isEmpty()){
+                        CXCommonUtils.sendNotify(TRAIN_NOTIFY_TITLE, String.format(TRAIN_NOTIFY_CONTENT, row.getCoursename(),
+                                        row.getTrainingstarttime(), row.getTrainingendtimt()), "", new ArrayList<>(userIds) ,
+                                row.getId(), TRAINING);
+                    }
                     // 获取参与过本次培训计划的员工
                     QueryWrapper<EmpExamDo> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("PLANID", row.getId());