From cc3ee867373181cf4dc1c950ec912e34288f4451 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 16 Feb 2023 15:15:40 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=95=B4=E4=BD=93=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SendMessageServiceImpl.java | 45 ++++++------- .../WorkGroupMeetingController.java | 4 +- .../meeting/service/IPayMeetingService.java | 3 +- .../service/impl/PayMeetingServiceImpl.java | 65 ++++++++++++------- .../jero/meeting/vo/PublishReminderVO.java | 4 ++ .../PayWorkingGroupSubItemController.java | 42 ++++++++++++ .../mapper/PayWorkingGroupSubItemMapper.java | 2 + .../xml/PayWorkingGroupSubItemMapper.xml | 21 ++++++ .../IPayWorkingGroupSubItemService.java | 3 +- ...ingGroupDistributionRecordServiceImpl.java | 1 + .../PayWorkingGroupSubItemServiceImpl.java | 6 ++ 11 files changed, 148 insertions(+), 48 deletions(-) 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 1e55f0c6..241cdf00 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 @@ -110,28 +110,29 @@ public class SendMessageServiceImpl implements SendMessageService { throw new JeroBootException("邮件发送，邮箱地址不能为空！"); } try { - String email = loginUser.getEmail(); - String emailPassword = loginUser.getEmailPassword(); - //如果发件人没有邮箱或邮箱授权码则使用admin账户的邮箱授权码 - if (StringUtils.isBlank(email) || StringUtils.isBlank(emailPassword)) { - loginUser = sysBaseAPI.getUserByName(env.getProperty("message.systemEmailUser")); - email = loginUser.getEmail(); - emailPassword = loginUser.getEmailPassword(); - } - 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); - } - } + throw new JeroBootException("邮件发送失败，发件人的邮箱或邮箱授权码错误！"); + //String email = loginUser.getEmail(); + //String emailPassword = loginUser.getEmailPassword(); + ////如果发件人没有邮箱或邮箱授权码则使用admin账户的邮箱授权码 + //if (StringUtils.isBlank(email) || StringUtils.isBlank(emailPassword)) { + // loginUser = sysBaseAPI.getUserByName(env.getProperty("message.systemEmailUser")); + // email = loginUser.getEmail(); + // emailPassword = loginUser.getEmailPassword(); + //} + //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); + // } + //} }catch (Exception e){ log.error("发送邮件异常",e); if (e.getMessage() !=null){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index b7651271..600995d2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -249,8 +249,8 @@ public class WorkGroupMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG1,"C_OPEN_TYPE1"); - return Result.OK(); + List strings = payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG1, "C_OPEN_TYPE1"); + return Result.OK("发布成功",strings); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 860b0780..ea78f2b1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -62,8 +62,9 @@ public interface IPayMeetingService extends IService { * 发布提醒 * @author lijiarao * @date 2021/9/27 + * @return */ - void publishReminder(PublishReminderVO publishReminderVO, CompanyMessageEnums companyMessageEnums, String busType); + List publishReminder(PublishReminderVO publishReminderVO, CompanyMessageEnums companyMessageEnums, String busType); IPage pageListContract(Page page, PayMeeting payMeeting, HttpServletRequest request, LoginUser sysUser); 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 0ced8a69..5343ccc6 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 @@ -622,7 +622,7 @@ public class PayMeetingServiceImpl extends ServiceImpl publishReminder(PublishReminderVO publishReminderVO, CompanyMessageEnums companyMessageEnums, String busType) { List meetingIds = publishReminderVO.getMeetingIds(); List subitemIds = publishReminderVO.getSubitemIds(); Integer projectType = publishReminderVO.getProjectType(); @@ -635,25 +635,23 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); List contactsIdList = new ArrayList<>(); String workingGroupId = null; - //工作组项目查询公司 + //工作组项目直接是人 if (Objects.equals(projectType, 1)) { - List payWorkingGroupSubItems = payWorkingGroupSubItemService.listByIds(subitemIds); //把单位会员中所有的联系人取出 - for (PayWorkingGroupSubItem payWorkingGroupSubItem : payWorkingGroupSubItems) { - workingGroupId = payWorkingGroupSubItem.getWorkingGroupId(); - String groupSubItemId = payWorkingGroupSubItem.getId(); - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId, groupSubItemId); - List groupSubItemContactsList = workingGroupSubItemContactsService.list(wrapper1); - for (PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts : groupSubItemContactsList) { - String contactsId = payWorkingGroupSubItemContacts.getContactsId(); - contactsIdList.add(contactsId); - meetingRemindRecordList.add( - new PayMeetingRemindRecord() - .setSubitemId(groupSubItemId) - .setContactId(contactsId) - ); - } + workingGroupId = publishReminderVO.getWorkingGroupId(); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId, workingGroupId); + wrapper1.in(PayWorkingGroupSubItemContacts::getContactsId,subitemIds); + List groupSubItemContactsList = workingGroupSubItemContactsService.list(wrapper1); + for (PayWorkingGroupSubItemContacts payWorkingGroupSubItemContacts : groupSubItemContactsList) { + String groupSubItemId = payWorkingGroupSubItemContacts.getWorkingGroupSubId(); + String contactsId = payWorkingGroupSubItemContacts.getContactsId(); + contactsIdList.add(contactsId); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(groupSubItemId) + .setContactId(contactsId) + ); } // 分标委项目查询人 } else if (Objects.equals(projectType, 2)) { @@ -689,6 +687,9 @@ public class PayMeetingServiceImpl extends ServiceImpl payMeetings = listByIds(meetingIds); + List listMsg = new ArrayList<>(); + int successAll = 0; + int failedAll = 0; for (PayMeeting payMeeting : payMeetings) { String meetingId = payMeeting.getId(); meetingIdList.add(meetingId); @@ -703,7 +704,11 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingIds; @ApiModelProperty(value = "成员id列表") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index c8c3c144..575e298a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -20,6 +20,7 @@ import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; import com.jero.common.vo.ProjectDetailVO; +import com.jero.company.entity.PayContactsManagement; import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; @@ -153,6 +154,47 @@ public class PayWorkingGroupSubItemController extends JeroController publishReminderList(PayWorkingGroupSubItem payWorkingGroupSubItem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "paymentDate", required = false) String paymentDate) { + if (!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName()) && payWorkingGroupSubItem.getChargeCompanyTemporaryName().length() > 50) { + return Result.error("成员单位长度不能大于50个字符"); + } + if (StringUtils.isBlank(payWorkingGroupSubItem.getWorkingGroupId())) { + return Result.error("工作组id不能为空！"); + } + if(!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName())){ + payWorkingGroupSubItem.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubItem.getChargeCompanyTemporaryName())); + } + PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId()); + if(Objects.isNull(payWorkingGroup)){ + return Result.error("工作组不存在！"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!rolePermissionService.getRolePermission("workingGroupMember:search") + && !Objects.equals(payWorkingGroup.getPrincipalIdA(),sysUser.getId()) + && !Objects.equals(payWorkingGroup.getPrincipalIdB(),sysUser.getId())){ + return Result.error("数据权限不足！"); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payWorkingGroupSubItemService.publishReminderList(page, payWorkingGroupSubItem); + + return Result.OK(pageList); + } + /** * 企业端-工作组项目-分页列表查询 * 工作组的企业联系人1，2，3、邮寄联系人、打包的企业联系人、打包联系人、关联合同的签订单位联系人 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java index 489bf87d..ee767266 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java @@ -2,6 +2,7 @@ package com.jero.project.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.company.entity.PayContactsManagement; import com.jero.project.entity.PayWorkGroupSubletStatistics; import com.jero.project.entity.PayWorkingGroupSubItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -57,4 +58,5 @@ public interface PayWorkingGroupSubItemMapper extends BaseMapper publishReminderList(Page page, @Param("payWorkingGroupSubItem") PayWorkingGroupSubItem payWorkingGroupSubItem); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 8785d831..6c58e5e2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -313,4 +313,25 @@ group by pwgs.id order by pwgs.create_time desc + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java index e28cdb8f..b6ee4b86 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java @@ -3,6 +3,7 @@ package com.jero.project.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.company.entity.PayContactsManagement; import com.jero.project.entity.PayWorkGroupSubletStatistics; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.entity.PayWorkingGroupSubletSearch; @@ -10,7 +11,6 @@ import com.jero.project.vo.SetChargeInput; import com.jero.statistics.entity.AllMoney; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; import java.util.List; /** @@ -117,4 +117,5 @@ public interface IPayWorkingGroupSubItemService extends IService publishReminderList(Page page, PayWorkingGroupSubItem payWorkingGroupSubItem); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index 4f2a984c..d607d845 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -442,6 +442,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl publishReminderList(Page page, PayWorkingGroupSubItem payWorkingGroupSubItem) { + IPage payWorkingGroupSubItemIPage = payWorkingGroupSubItemMapper.publishReminderList(page, payWorkingGroupSubItem); + return payWorkingGroupSubItemIPage; + } + /** * @Description 删除项目打包关联，临时企业、联系信息 * @Author lqt