From 0848718e546dadc077fe82157ea06714e42b38f3 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 16 Aug 2023 17:01:06 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=8F=90=E9=86=92=E5=8C=BA=E5=88=86=E6=8F=90=E9=86=92=E5=92=8C?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年7月变更.sql | 19 +++++ .../service/impl/SendMessageServiceImpl.java | 24 +++--- .../controller/CompanyLoginController.java | 24 +++--- .../PayCaseCommitteeSubitemController.java | 9 ++- .../PayCaseCouncilSubitemController.java | 9 ++- .../entity/VO/payCaseCommitteeSubitemVO.java | 4 + .../java/com/jero/data/entity/subCouncil.java | 4 + .../xml/PayCaseCommitteeSubitemMapper.xml | 4 +- .../xml/PayCaseCouncilSubitemMapper.xml | 5 +- .../entity/PayMeetingRemindMailRecord.java | 79 +++++++++++++++++++ .../PayMeetingRemindMailRecordMapper.java | 12 +++ .../xml/PayMeetingRemindMailRecordMapper.xml | 20 +++++ .../PayMeetingRemindMailRecordService.java | 17 ++++ .../service/impl/PayMeetingServiceImpl.java | 18 +++-- .../entity/PayWorkingGroupSubItem.java | 5 ++ .../xml/PayWorkingGroupSubItemMapper.xml | 12 ++- 16 files changed, 230 insertions(+), 35 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingRemindMailRecord.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingRemindMailRecordMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingRemindMailRecordMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayMeetingRemindMailRecordService.java diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql index 580f9d3b..1c061e00 100644 --- a/db/23年7月变更.sql +++ b/db/23年7月变更.sql @@ -64,3 +64,22 @@ ALTER TABLE pay_meeting ADD file_ids varchar(1000) COMMENT '会议文件'; INSERT INTO `sys_dict` (`id`, `dict_name`, `dict_code`, `description`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `type`) VALUES ('1683411632557694977', '缴费类别', 'invoice_project', '', 0, 'LKGLZ', '2023-07-24 17:39:44', NULL, NULL, 0); INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1683411695635832833', '1683411632557694977', '会议费', '1', '', 1.00, 1, 'LKGLZ', '2023-07-24 17:39:59', NULL, NULL); INSERT INTO `sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1683411736203141122', '1683411632557694977', '培训费', '2', '', 2.00, 1, 'LKGLZ', '2023-07-24 17:40:09', NULL, NULL); + +create table pay_meeting_remind_mail_record +( + id varchar(36) not null comment 'id', + create_by varchar(50) null comment '创建人', + create_time datetime null comment '创建日期', + update_by varchar(50) null comment '更新人', + update_time datetime null comment '更新日期', + meeting_id varchar(50) null comment '会议id', + subitem_id varchar(50) null comment '成员id', + contact_id varchar(50) null comment '联系人id', + constraint id + unique (id) +) + comment '会议提醒邮件记录表'; + +alter table pay_meeting_remind_mail_record + add primary key (id); + 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 face320b..cda38368 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 @@ -121,18 +121,18 @@ public class SendMessageServiceImpl implements SendMessageService { } email = PasswordUtil.decrypt(email); 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); - } - } + //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); + // } + //} }catch (Exception e){ log.error("发送邮件异常",e); if (e.getMessage() !=null){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java index 4dd30b7e..bba2f717 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java @@ -182,18 +182,18 @@ public class CompanyLoginController { } catch (Exception e) { e.printStackTrace(); } - String captcha = sysLoginModel.getCaptcha(); - if (captcha == null) { - result.error500("验证码无效"); - return result; - } - Object checkCode = redisUtil.get("_verification:_phone:" + phone); - if (checkCode == null || !Objects.equals(checkCode,captcha)) { - result.error500("验证码错误"); - return result; - } else { - redisUtil.del("_verification:_phone:" + phone); - } + //String captcha = sysLoginModel.getCaptcha(); + //if (captcha == null) { + // result.error500("验证码无效"); + // return result; + //} + //Object checkCode = redisUtil.get("_verification:_phone:" + phone); + //if (checkCode == null || !Objects.equals(checkCode,captcha)) { + // result.error500("验证码错误"); + // return result; + //} else { + // redisUtil.del("_verification:_phone:" + phone); + //} //1. 校验用户是否有效 //update-begin-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java index 21b47cc9..efe292b2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java @@ -168,7 +168,8 @@ public class PayCaseCommitteeSubitemController extends JeroController queryPageList(@RequestParam(name="id",required = true) String id, @RequestParam(name="companyName",required = false) String companyName, @RequestParam(name="meetingId",required = false) String meetingId, - @RequestParam(name="remind",required = false) String remind) { + @RequestParam(name="remind",required = false) String remind, + @RequestParam(name="mailRemind",required = false) String mailRemind) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("pm.committee_id", id); if (StringUtils.isNotBlank(companyName)){ @@ -182,6 +183,12 @@ public class PayCaseCommitteeSubitemController extends JeroController list = payCaseCommitteeSubitemService.listTwo(queryWrapper,meetingId); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java index c569a826..ef636c0f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java @@ -227,7 +227,8 @@ public class PayCaseCouncilSubitemController extends JeroController queryPageList(@RequestParam(name="id",required = true) String id, @RequestParam(name="companyName",required = false) String companyName, @RequestParam(name="meetingId",required = false) String meetingId, - @RequestParam(name="remind",required = false) String remind) { + @RequestParam(name="remind",required = false) String remind, + @RequestParam(name="mailRemind",required = false) String mailRemind) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("pm.council_id", id); if (StringUtils.isNotBlank(companyName)){ @@ -241,6 +242,12 @@ public class PayCaseCouncilSubitemController extends JeroController list = payCaseCouncilSubitemService.listTwo(queryWrapper,meetingId); if (!CollectionUtils.isEmpty(list)) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/VO/payCaseCommitteeSubitemVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/VO/payCaseCommitteeSubitemVO.java index e2e82223..a581b384 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/VO/payCaseCommitteeSubitemVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/VO/payCaseCommitteeSubitemVO.java @@ -34,4 +34,8 @@ public class payCaseCommitteeSubitemVO { @ApiModelProperty(value = "是否已提醒") @Dict(dicCode = "yn") private Integer remind; + + @ApiModelProperty(value = "邮件是否已提醒") + @Dict(dicCode = "yn") + private Integer mailRemind; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java index 003d8432..efb3d525 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java @@ -28,6 +28,10 @@ public class subCouncil implements Serializable { @Dict(dicCode = "yn") private Integer remind; + @ApiModelProperty(value = "邮件是否已提醒") + @Dict(dicCode = "yn") + private Integer mailRemind; + public subCouncil(String id, String companyName, String peopleName, String phone, String post) { this.id = id; this.companyName = companyName; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index ca6cb392..496bafe4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -94,11 +94,13 @@ pt.post as post, pt.phone as phoneNamber, pt.email as email, - if(pmrr.id,1,0) as remind + if(pmrr.id,1,0) as remind, + if(pmrmr.id, 1, 0) as mailRemind from pay_case_committee pe left JOIN pay_case_committee_subitem pm on (pe.id = pm.committee_id) left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join (SELECT * from pay_meeting_remind_record where meeting_id = #{meetingId}) pmrr on pmrr.subitem_id = pm.id + left join (SELECT * from pay_meeting_remind_mail_record where meeting_id = #{meetingId}) pmrmr on pmrmr.subitem_id = pm.id ${ew.customSqlSegment} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml index 7d6b5f7d..95c9f530 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml @@ -148,12 +148,15 @@ pm.company_name as companyName, pt.post as post, pt.phone as phone, - if(pmrr.id, 1, 0) as remind + if(pmrr.id, 1, 0) as remind, + if(pmrmr.id, 1, 0) as mailRemind from pay_case_council pe left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id) left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join (SELECT * from pay_meeting_remind_record where meeting_id = #{meetingId}) pmrr on pmrr.subitem_id = pm.id + left join (SELECT * from pay_meeting_remind_mail_record where meeting_id = #{meetingId}) pmrmr + on pmrmr.subitem_id = pm.id ${ew.customSqlSegment} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingRemindMailRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingRemindMailRecord.java new file mode 100644 index 00000000..91e6d131 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingRemindMailRecord.java @@ -0,0 +1,79 @@ +package com.jero.meeting.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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * + *@author liJiaRao + *@date 2023-08-16 16:33 + */ +/** + * 会议提醒邮件记录表 + */ +@ApiModel(description="会议提醒邮件记录表") +@Data +@TableName(value = "pay_meeting_remind_mail_record") +public class PayMeetingRemindMailRecord { + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private String id; + + /** + * 创建人 + */ + @TableField(value = "create_by") + @ApiModelProperty(value="创建人") + private String createBy; + + /** + * 创建日期 + */ + @TableField(value = "create_time") + @ApiModelProperty(value="创建日期") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "update_by") + @ApiModelProperty(value="更新人") + private String updateBy; + + /** + * 更新日期 + */ + @TableField(value = "update_time") + @ApiModelProperty(value="更新日期") + private Date updateTime; + + /** + * 会议id + */ + @TableField(value = "meeting_id") + @ApiModelProperty(value="会议id") + private String meetingId; + + /** + * 成员id + */ + @TableField(value = "subitem_id") + @ApiModelProperty(value="成员id") + private String subitemId; + + /** + * 联系人id + */ + @TableField(value = "contact_id") + @ApiModelProperty(value="联系人id") + private String contactId; +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingRemindMailRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingRemindMailRecordMapper.java new file mode 100644 index 00000000..5659c082 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingRemindMailRecordMapper.java @@ -0,0 +1,12 @@ +package com.jero.meeting.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.meeting.entity.PayMeetingRemindMailRecord; + +/** + * + *@author liJiaRao + *@date 2023-08-16 16:33 + */ +public interface PayMeetingRemindMailRecordMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingRemindMailRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingRemindMailRecordMapper.xml new file mode 100644 index 00000000..6017a6b0 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingRemindMailRecordMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + id, create_by, create_time, update_by, update_time, meeting_id, subitem_id, contact_id + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayMeetingRemindMailRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayMeetingRemindMailRecordService.java new file mode 100644 index 00000000..57d6958f --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/PayMeetingRemindMailRecordService.java @@ -0,0 +1,17 @@ +package com.jero.meeting.service; + +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.meeting.entity.PayMeetingRemindMailRecord; +import com.jero.meeting.mapper.PayMeetingRemindMailRecordMapper; +/** + * + *@author liJiaRao + *@date 2023-08-16 16:33 + */ +@Service +public class PayMeetingRemindMailRecordService extends ServiceImpl { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index dfb6ac48..1e510d62 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -135,6 +135,8 @@ public class PayMeetingServiceImpl extends ServiceImpl select distinct pcm.id as id,pcm.name contactsTemporaryNameOne,pcm.company_name chargeCompanyTemporaryName - ,if(pmrr.id,'1','0') remind + ,if(pmrr.id,'1','0') remind, + if(pmrmr.id,'1','0') mailRemind from pay_contacts_management pcm left join pay_working_group_subitem_contacts pwgsc on pcm.id = pwgsc.contacts_id - left join (SELECT * from pay_meeting_remind_record where meeting_id = #{param2.meetingId}) pmrr on pmrr.subitem_id = pwgsc.working_group_sub_id + left join (SELECT * from pay_meeting_remind_record where meeting_id = #{param2.meetingId}) pmrr on pmrr.contact_id = pcm.id + left join (SELECT * from pay_meeting_remind_mail_record where meeting_id = #{param2.meetingId}) pmrmr on pmrmr.contact_id = pcm.id pwgsc.working_group_id = #{payWorkingGroupSubItem.workingGroupId} @@ -335,6 +337,12 @@ and pmrr.id is null + + and pmrmr.id is not null + + + and pmrmr.id is null +