diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index 369cacc9..7e096513 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -123,16 +123,16 @@ public class SendMessageServiceImpl implements SendMessageService { emailPassword = PasswordUtil.decrypt(emailPassword); //EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(email,emailPassword); //// 发送带附件邮箱 - //if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){ - // emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile()); - //}else{ - // //如果有通知内容就替换 - // if (StringUtils.isNotBlank(sendMessageDTO.getMeetingNotice())){ - // emailHandle.SendMsg(sendMessageDTO.getEmail(), title, sendMessageDTO.getMeetingNotice()); - // }else { - // emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); - // } - //} +// if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){ +// emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile()); +// }else{ +// //如果有通知内容就替换 +// if (StringUtils.isNotBlank(sendMessageDTO.getMeetingNotice())){ +// emailHandle.SendMsg(sendMessageDTO.getEmail(), title, sendMessageDTO.getMeetingNotice()); +// }else { +// emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); +// } +// } }catch (Exception e){ log.error("发送邮件异常",e); if (e.getMessage() !=null){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java deleted file mode 100644 index 048acf54..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jero.drafting.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.DictPoint; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.base.controller.JeroController; -import com.jero.drafting.entity.PayDraftingGroupDistributionRecord; -import com.jero.drafting.service.IPayDraftingGroupDistributionRecordService; -import com.jero.modules.oss.service.IOSSFileService; -import com.jero.project.common.PayProjectCommon; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - *

- * 起草组成员企业联系人表 前端控制器 - *

- * - * @author sz - * @since 2024-01-02 - */ -//@Api(tags = "起草组-分发记录") -@RestController -@RequestMapping("/drafting/payDraftingGroupDistributionRecord") -@Slf4j -public class PayDraftingGroupDistributionRecordController extends JeroController { - -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java deleted file mode 100644 index c782adc8..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.jero.drafting.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: pay_drafting_group_distribution_record - * @Author: jeecg-boot - * @Date: 2024-01-05 - * @Version: V1.0 - */ -@Data -@TableName("pay_drafting_group_distribution_record") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="pay_drafting_group_distribution_record", description="pay_drafting_group_distribution_record") -public class PayDraftingGroupDistributionRecord implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - /**资料id*/ - @Excel(name = "资料id", width = 15) - @ApiModelProperty(value = "资料id") - private String dataId; - /**起草组id或者分标委id*/ - @Excel(name = "起草组id或者分标委id", width = 15) - @ApiModelProperty(value = "起草组id或者分标委id") - private String projectId; - /**工作组成员id或者分标委成员id*/ - @Excel(name = "工作组成员id或者分标委成员id", width = 15) - @ApiModelProperty(value = "工作组成员id或者分标委成员id") - private String subId; - /**文件id*/ - @Excel(name = "文件id", width = 15) - @ApiModelProperty(value = "文件id") - private String fileId; - /**联系人id*/ - @Excel(name = "联系人id", width = 15) - @ApiModelProperty(value = "联系人id") - private String contactsId; - /**联系人名称*/ - @Excel(name = "联系人名称", width = 15) - @ApiModelProperty(value = "联系人名称") - private String contactsName; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /**资料ids 多个以逗号分隔*/ - @Excel(name = "资料ids 多个以逗号分隔", width = 15) - @ApiModelProperty(value = "资料ids 多个以逗号分隔") - @TableField(exist = false) - private String dataIds; - - /**项目类型1:起草组,2:分标委*/ - @ApiModelProperty(value = "项目类型1:起草组,2:分标委") - private Integer projectType; - - /**联系人ids 多个以逗号分隔*/ - @TableField(exist = false) - @ApiModelProperty(value = "联系人ids 多个以逗号分隔") - private String contactsIds; - /** - * 联系人临时id - */ - @TableField(exist = false) - @ApiModelProperty(value = "联系人临时id") - private String temporaryContactsId; - - /** - * 是否发送邮件 - */ - @TableField(exist = false) - @ApiModelProperty(value = "是否发送邮件") - private Integer sendEmailFlag; -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java deleted file mode 100644 index ad520f9f..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jero.drafting.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.drafting.entity.PayDraftingGroupDistributionRecord; - -/** - *

- * 起草组-分发记录表 Mapper 接口 - *

- * - * @author sz - * @since 2024-01-02 - */ -public interface PayDraftingGroupDistributionRecordMapper extends BaseMapper { -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml deleted file mode 100644 index 690830da..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml index 06e5fba3..fd3940c6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml @@ -4,7 +4,7 @@