admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG修复

Browse Source
This commit is contained in:
pengjie 2024-06-25 14:04:36 +08:00
parent cf3362ed66
commit df3bef2f4e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainServiceImpl.java
View File

@ -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<ExamTrainMapper, ExamTrain
List<Long> 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;
}

6
src/main/java/com/zhgd/xmgl/task/ExamTask.java
View File

@ -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())));
}
}
}