add 会议发布提醒增加是否发送邮件参数
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
package com.jero.common.dto;
|
package com.jero.common.dto;
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
@@ -53,4 +54,9 @@ public class SendMessageDTO implements Serializable {
|
|||||||
* 文件名集合(邮箱发送附件)
|
* 文件名集合(邮箱发送附件)
|
||||||
*/
|
*/
|
||||||
private List<String> listFile;
|
private List<String> listFile;
|
||||||
|
/**
|
||||||
|
* 是否发送邮件
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value = "是否发送邮件")
|
||||||
|
private Integer sendEmailFlag;
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -104,8 +104,9 @@ public class SendMessageServiceImpl implements SendMessageService {
|
|||||||
// 1短信 2邮件 3系统
|
// 1短信 2邮件 3系统
|
||||||
// 发送邮件 true
|
// 发送邮件 true
|
||||||
String fromUser = sendMessageDTO.getFromUser();
|
String fromUser = sendMessageDTO.getFromUser();
|
||||||
|
Integer sendEmailFlag = sendMessageDTO.getSendEmailFlag();
|
||||||
LoginUser loginUser = sysBaseAPI.getUserByName(fromUser);
|
LoginUser loginUser = sysBaseAPI.getUserByName(fromUser);
|
||||||
if(templateType.contains(ProjectCommon.MESSAGE_TYPE2)){
|
if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)){
|
||||||
if(StringUtils.isEmpty(sendMessageDTO.getEmail())){
|
if(StringUtils.isEmpty(sendMessageDTO.getEmail())){
|
||||||
throw new JeroBootException("邮件发送,邮箱地址不能为空!");
|
throw new JeroBootException("邮件发送,邮箱地址不能为空!");
|
||||||
}
|
}
|
||||||
|
|||||||
+1
@@ -724,6 +724,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
map.put("meetingType", meetingType);
|
map.put("meetingType", meetingType);
|
||||||
map.put("meetingName", payMeeting.getMeetingName());
|
map.put("meetingName", payMeeting.getMeetingName());
|
||||||
map.put("busId", meetingId);
|
map.put("busId", meetingId);
|
||||||
|
sendMessageDTO.setSendEmailFlag(publishReminderVO.getSendEmailFlag());
|
||||||
sendMessageDTO.setEmail(PasswordUtil.decrypt(email));
|
sendMessageDTO.setEmail(PasswordUtil.decrypt(email));
|
||||||
sendMessageDTO.setToUser(PasswordUtil.decrypt(phone));
|
sendMessageDTO.setToUser(PasswordUtil.decrypt(phone));
|
||||||
sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
|
sendMessageDTO.setPhone(PasswordUtil.decrypt(phone));
|
||||||
|
|||||||
@@ -21,4 +21,6 @@ public class PublishReminderVO {
|
|||||||
private List<String> subitemIds;
|
private List<String> subitemIds;
|
||||||
@ApiModelProperty(value = "项目类型1:工作组,2:分标委")
|
@ApiModelProperty(value = "项目类型1:工作组,2:分标委")
|
||||||
private Integer projectType;
|
private Integer projectType;
|
||||||
|
@ApiModelProperty(value = "是否发送邮件")
|
||||||
|
private Integer sendEmailFlag;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user