From f546b17aac8af7f2797043e111247ad09b3b4296 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 13 Sep 2021 16:21:21 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=8F=91=E5=B8=83=E6=8F=90=E9=86=92=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E6=8F=90=E9=86=92=E5=A4=9A=E4=B8=AA=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/meeting/controller/PayMeetingController.java | 9 +-------- .../com/jero/meeting/service/IPayMeetingService.java | 2 +- .../meeting/service/impl/PayMeetingServiceImpl.java | 10 ++++++---- .../java/com/jero/meeting/vo/PublishReminderVO.java | 2 +- 4 files changed, 9 insertions(+), 14 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 4846c58a..184407d8 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 @@ -6,11 +6,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.jero.common.api.vo.Result; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.query.QueryGenerator; @@ -35,11 +33,6 @@ import com.jero.project.entity.PayWorkingGroup; import com.jero.project.service.IPayWorkingGroupService; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.poi.ss.formula.functions.T; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -332,7 +325,7 @@ public class PayMeetingController extends JeroController publishReminder(@RequestBody PublishReminderVO publishReminderVO) { - payMeetingService.publishReminder(publishReminderVO.getMeetingId(),publishReminderVO.getSubitemIds()); + payMeetingService.publishReminder(publishReminderVO.getMeetingIds(),publishReminderVO.getSubitemIds()); return Result.OK(); } 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 809852fd..8631e402 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 @@ -50,5 +50,5 @@ public interface IPayMeetingService extends IService { * @param meetingId * @param subitemIds */ - void publishReminder(String meetingId, List subitemIds); + void publishReminder(List meetingIds, List subitemIds); } 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 ec83d0e7..23c9398e 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 @@ -255,8 +255,7 @@ public class PayMeetingServiceImpl extends ServiceImpl subitemIds) { - PayMeeting payMeeting = getById(meetingId); + public void publishReminder(List meetingIds, List subitemIds) { List payWorkingGroupSubItems = payWorkingGroupSubItemService.listByIds(subitemIds); List userIds = new ArrayList<>(); //把单位会员中所有的联系人和有机联系人取出 @@ -283,10 +282,13 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(PayContactsManagementTemporary::getId,userIds); List list = payContactsManagementTemporaryService.list(wrapper); + List payMeetings = listByIds(meetingIds); for (PayContactsManagementTemporary payContactsManagementTemporary : list) { //TODO 发送消息 } - payMeeting.setRemind(MeetingCommon.REMIND_1); - saveOrUpdate(payMeeting); + for (PayMeeting payMeeting : payMeetings) { + payMeeting.setRemind(MeetingCommon.REMIND_1); + saveOrUpdate(payMeeting); + } } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java index b40862bf..eead29b5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java @@ -12,7 +12,7 @@ import java.util.List; @Data public class PublishReminderVO { @ApiModelProperty(value = "会议id") - private String meetingId; + private List meetingIds; @ApiModelProperty(value = "成员id列表") private List subitemIds; }