From df3bef2f4e37d08ca79b6a9e01367427d74a7b80 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 25 Jun 2024 14:04:36 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/exam/service/impl/ExamTrainServiceImpl.java | 7 ++++--- src/main/java/com/zhgd/xmgl/task/ExamTask.java | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java index b06c6bc03..9c5d1c555 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.exam.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -126,10 +127,10 @@ public class ExamTrainServiceImpl extends ServiceImpl workerIds = examTrain.getExamTrainRecordList().stream().map(e -> e.getWorkerId()).collect(Collectors.toList()); String emails = workerInfoService.listByIds(workerIds).stream().map(w -> w.getPersonMail()).collect(Collectors.joining(",")); emailUtils.sendHtmlMail(emails, "安全教育培训提醒", StrUtil.format("【尾矿固废资源综合利用项目】智慧工地管理系统提醒：您有一条培训通知请查收！\n" + - "【{}】在【{}}】下发了一个培训计划名称为【{}}】、科目名称为【{}】、教育主题为【{}】的培训计划，" + + "【{}】在【{}】下发了一个培训计划名称为【{}】、科目名称为【{}】、教育主题为【{}】的培训计划，" + "需要您使用姓名、身份证号登录手机APP端进行课程学习及考试测评，培训有效期限为【{}】，未避免超期未参与培训导致您的安全积分被扣除，" + - "请在规定有效期限内参加培训！", user.getRealName(), new Date(), examTrain.getName(), examSubject.getName(), - examTrain.getTitle(), examTrain.getTrainBeginTime() + " - " + examTrain.getTrainEndTime())); + "请在规定有效期限内参加培训！", user.getRealName(), DateUtil.formatDateTime(new Date()), examTrain.getName(), examSubject.getName(), + examTrain.getTitle(), DateUtil.formatDateTime(examTrain.getTrainBeginTime()) + " - " + DateUtil.formatDateTime(examTrain.getTrainEndTime()))); } return flag; } diff --git a/src/main/java/com/zhgd/xmgl/task/ExamTask.java b/src/main/java/com/zhgd/xmgl/task/ExamTask.java index aecc84b3d..8b56ba90f 100644 --- a/src/main/java/com/zhgd/xmgl/task/ExamTask.java +++ b/src/main/java/com/zhgd/xmgl/task/ExamTask.java @@ -175,10 +175,10 @@ public class ExamTask { } if (StringUtils.isNotBlank(examTrain) || examTrain.length() == 0) { emailUtils.sendHtmlMail(examTrain.toString(), "安全教育培训提醒", StrUtil.format("【尾矿固废资源综合利用项目】智慧工地管理系统提醒：您有一条培训通知请查收！\n" + - "【{}】在【{}}】下发了一个培训计划名称为【{}}】、科目名称为【{}】、教育主题为【{}】的培训计划，" + + "【{}】在【{}】下发了一个培训计划名称为【{}】、科目名称为【{}】、教育主题为【{}】的培训计划，" + "需要您使用姓名、身份证号登录手机APP端进行课程学习及考试测评，培训有效期限为【{}】，未避免超期未参与培训导致您的安全积分被扣除，" + - "请在规定有效期限内参加培训！", systemUser.getRealName(), new Date(), examTrainList.get(j).getName(), examSubject.getName(), - examTrainList.get(j).getTitle(), examTrainList.get(j).getTrainBeginTime() + " - " + examTrainList.get(j).getTrainEndTime())); + "请在规定有效期限内参加培训！", systemUser.getRealName(), DateUtil.formatDateTime(new Date()), examTrainList.get(j).getName(), examSubject.getName(), + examTrainList.get(j).getTitle(), DateUtil.formatDateTime(examTrainList.get(j).getTrainBeginTime()) + " - " + DateUtil.formatDateTime(examTrainList.get(j).getTrainEndTime()))); } } }