From d20cb790b73d77d78a9e7a72c2c2f864106e676c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 29 Sep 2021 21:14:37 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMeetingController.java | 54 ++++++++++------ .../com/jero/meeting/entity/PayMeeting.java | 6 ++ .../entity/PayMeetingRemindRecord.java | 5 ++ .../jero/meeting/mapper/PayMeetingMapper.java | 6 +- .../meeting/mapper/xml/PayMeetingMapper.xml | 10 ++- .../IPayMeetingRemindRecordService.java | 8 +-- .../meeting/service/IPayMeetingService.java | 3 +- .../PayMeetingRemindRecordServiceImpl.java | 12 ++-- .../service/impl/PayMeetingServiceImpl.java | 64 +++++++++++++------ 9 files changed, 111 insertions(+), 57 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index e42e3bba..004d4fae 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -7,8 +7,6 @@ import javax.servlet.http.HttpServletRequest; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.http.HttpUtil; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.api.vo.Result; @@ -20,6 +18,8 @@ import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; +import com.jero.company.entity.PayContactsManagement; +import com.jero.company.service.IPayContactsManagementService; import com.jero.data.entity.PayCaseCommittee; import com.jero.data.service.IPayCaseCommitteeService; import com.jero.meeting.common.MeetingCommon; @@ -44,6 +44,7 @@ import com.jero.util.QrcodeUtil; import io.swagger.annotations.ApiImplicitParam; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; @@ -79,11 +80,13 @@ public class PayMeetingController extends JeroController queryPageList(PayMeeting payMeeting, @@ -155,26 +158,41 @@ public class PayMeetingController extends JeroController a.eq("pms.company_contact_id",id).or().eq("pms.post_contact_id",id) - ); + + //会议报名状态：1可报名/2已报名 + String meetingSignUpType = req.getParameter("meetingSignUpType"); + if (Objects.equals(meetingSignUpType,1+"")) { + queryWrapper.eq("pmrr.contact_id",id); + }else if (Objects.equals(meetingSignUpType,2+"")) { + queryWrapper.eq("pms.company_contact_id",id); + }else { + queryWrapper.and( + a -> a.eq("pms.company_contact_id",id) + .or() + .eq("pms.post_contact_id",id) + .or() + .eq("pmrr.contact_id",id) + ); + } Page page = new Page<>(pageNo, pageSize); - IPage pageList = payMeetingService.pageListContract(page, queryWrapper); + IPage pageList = payMeetingService.pageListContract(page, queryWrapper, now); for (PayMeeting meeting : pageList.getRecords()) { //查询会议负责人 LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId()); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index 2dbd46ba..83855e5c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -256,4 +256,10 @@ public class PayMeeting implements Serializable { @TableField(exist = false) @Dict(dicCode = "meeting_pay_type") private Integer payMode; + /** + * 会议状态 未开始：2 进行中：3 已结束4 + */ + @TableField(exist = false) + @Dict(dicCode = "meeting_status") + private Integer meetingStatus; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingRemindRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingRemindRecord.java index 3f42900e..000fdfea 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingRemindRecord.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingRemindRecord.java @@ -65,4 +65,9 @@ public class PayMeetingRemindRecord implements Serializable { @ApiModelProperty(value = "成员id") private String subitemId; + /**联系人id*/ + @Excel(name = "联系人id", width = 15) + @ApiModelProperty(value = "联系人id") + private String contactId; + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java index 64a752f6..2fa22c79 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java @@ -1,7 +1,5 @@ package com.jero.meeting.mapper; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; @@ -18,5 +16,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface PayMeetingMapper extends BaseMapper { - IPage pageListContract(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage pageListContract(Page page, + @Param(Constants.WRAPPER) QueryWrapper queryWrapper, + @Param("now") String now); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml index 39a38050..ac7930d4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml @@ -31,12 +31,20 @@ + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingRemindRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingRemindRecordService.java index 8f633859..03fc62d5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingRemindRecordService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingRemindRecordService.java @@ -46,9 +46,9 @@ public interface IPayMeetingRemindRecordService extends IService meetingIdList, List subitemIdList); + void addList(List meetingIdList, List subitemIdList); } 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 58efe70d..012d2671 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 @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.meeting.entity.PayMeeting; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.vo.PayMeetingVO; import com.jero.meeting.vo.PublishReminderVO; @@ -65,5 +64,5 @@ public interface IPayMeetingService extends IService { void publishReminder(PublishReminderVO publishReminderVO); - IPage pageListContract(Page page, QueryWrapper queryWrapper); + IPage pageListContract(Page page, QueryWrapper queryWrapper, String now); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java index 452d8608..dde0aff4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingRemindRecordServiceImpl.java @@ -67,16 +67,12 @@ public class PayMeetingRemindRecordServiceImpl extends ServiceImpl meetingIdList, List subitemIdList) { - List payMeetingRemindRecordList = new ArrayList<>(); + public void addList(List meetingIdList, List meetingRemindRecordList) { for (String meetingId : meetingIdList) { - for (String subitemId : subitemIdList) { - PayMeetingRemindRecord payMeetingRemindRecord = new PayMeetingRemindRecord(); - payMeetingRemindRecord.setMeetingId(meetingId); - payMeetingRemindRecord.setSubitemId(subitemId); - payMeetingRemindRecordList.add(payMeetingRemindRecord); + for (PayMeetingRemindRecord meetingRemindRecord : meetingRemindRecordList) { + meetingRemindRecord.setMeetingId(meetingId); + save(meetingRemindRecord); } } - this.saveBatch(payMeetingRemindRecordList); } } 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 eebb8923..cf7705db 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 @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.dto.SendMessageDTO; import com.jero.common.enums.CompanyMessageEnums; -import com.jero.common.enums.ManagementMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; import com.jero.common.system.api.ISysBaseAPI; @@ -25,7 +24,6 @@ import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingHotelContacts; import com.jero.meeting.entity.PayMeetingRemindRecord; -import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.mapper.PayMeetingMapper; import com.jero.meeting.service.IPayMeetingHotelContactsService; import com.jero.meeting.service.IPayMeetingRemindRecordService; @@ -37,14 +35,11 @@ import com.jero.meeting.valid.group.StandardMeeting; import com.jero.meeting.valid.group.WorkingGroupMeeting; import com.jero.meeting.vo.PayMeetingVO; import com.jero.meeting.vo.PublishReminderVO; -import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayWorkingGroupService; import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService; -import com.jero.temporary.entity.PayContactsManagementTemporary; -import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.util.CollectionUtils; import org.jetbrains.annotations.NotNull; @@ -55,7 +50,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -384,33 +378,61 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingIdList = new ArrayList<>(); List subitemIdList = new ArrayList<>(); + List meetingRemindRecordList = new ArrayList<>(); //组装查询联系人条件 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + List contactsIdList = new ArrayList<>(); //工作组项目查询公司 if (Objects.equals(projectType,1)){ - List companyIds = new ArrayList<>(); List payWorkingGroupSubItems = payWorkingGroupSubItemService.listByIds(subitemIds); - //把单位会员中所有的联系人和有机联系人取出 + //把单位会员中所有的联系人取出 for (PayWorkingGroupSubItem payWorkingGroupSubItem : payWorkingGroupSubItems) { - subitemIdList.add(payWorkingGroupSubItem.getId()); - String companyId = payWorkingGroupSubItem.getChargeCompanyId(); - companyIds.add(companyId); + String groupSubItemId = payWorkingGroupSubItem.getId(); + String contactsIdOne = payWorkingGroupSubItem.getContactsIdOne(); + if (StringUtils.isNotBlank(contactsIdOne)) { + contactsIdList.add(contactsIdOne); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(groupSubItemId) + .setContactId(contactsIdOne) + ); + } + String contactsIdTwo = payWorkingGroupSubItem.getContactsIdTwo(); + if (StringUtils.isNotBlank(contactsIdTwo)) { + contactsIdList.add(contactsIdTwo); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(groupSubItemId) + .setContactId(contactsIdTwo) + ); + } + String contactsIdThree = payWorkingGroupSubItem.getContactsIdThree(); + if (StringUtils.isNotBlank(contactsIdThree)) { + contactsIdList.add(contactsIdThree); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(groupSubItemId) + .setContactId(contactsIdThree) + ); + } } - wrapper.in(PayContactsManagement::getCompanyId,companyIds); // 分标委项目查询人 }else if (Objects.equals(projectType,2)){ - List contactsIdList = new ArrayList<>(); List payCaseCommitteeSubitems = payCaseCommitteeSubitemService.listByIds(subitemIds); - for (PayCaseCommitteeSubitem payCaseCommitteeSubitem : payCaseCommitteeSubitems) { - subitemIdList.add(payCaseCommitteeSubitem.getId()); - contactsIdList.add(payCaseCommitteeSubitem.getContactsId()); + String committeeSubitemId = payCaseCommitteeSubitem.getId(); + String contactsId = payCaseCommitteeSubitem.getContactsId(); + contactsIdList.add(contactsId); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(committeeSubitemId) + .setContactId(contactsId) + ); } - wrapper.in(PayContactsManagement::getId,contactsIdList); - }else { throw new JeroBootException("项目类型不正确"); } + wrapper.in(PayContactsManagement::getId,contactsIdList); List list = payContactsManagementService.list(wrapper); //标记会议为已提醒 @@ -450,11 +472,11 @@ public class PayMeetingServiceImpl extends ServiceImpl pageListContract(Page page, QueryWrapper queryWrapper) { - return baseMapper.pageListContract(page,queryWrapper); + public IPage pageListContract(Page page, QueryWrapper queryWrapper, String now) { + return baseMapper.pageListContract(page,queryWrapper,now); } }