From 6b51502347747e8fc3e34ae3f0d20a98da8aacba Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 3 Sep 2021 18:03:55 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=A0=87=E5=8D=8F=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=85=92=E5=BA=97=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayMeetingController.java | 31 +++++++++++++++++++ .../com/jero/meeting/entity/PayMeeting.java | 10 ++++++ .../service/impl/PayMeetingServiceImpl.java | 8 +++++ 3 files changed, 49 insertions(+) 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 aa596fbe..58db42e7 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 @@ -5,13 +5,19 @@ import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; +import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeeting; +import com.jero.meeting.entity.PayMeetingHotelContacts; +import com.jero.meeting.service.IPayMeetingHotelContactsService; import com.jero.meeting.service.IPayMeetingService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -20,6 +26,7 @@ import com.jero.meeting.vo.PayMeetingVO; import com.jero.modules.system.volid.group.UpdateGroup; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; @@ -42,6 +49,8 @@ public class PayMeetingController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payMeetingService.page(page, queryWrapper); for (PayMeeting meeting : pageList.getRecords()) { + //查询会议负责人 LoginUser user = sysBaseApi.getUserById(meeting.getDirectorId()); meeting.setDirectorName(user.getUsername()); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); + PayMeetingVO payMeetingVO = new PayMeetingVO(); + BeanUtils.copyProperties(payMeetingVO,payMeeting); + //查询酒店联系人列表 + if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingHotelContacts::getMeetingId,meeting.getId()); + List payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper); + meeting.setHotelContactsList(payMeetingHotelContactsList); + } } + return Result.OK(pageList); } @@ -132,6 +152,17 @@ public class PayMeetingController extends JeroController wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingHotelContacts::getMeetingId,payMeeting.getId()); + List payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper); + payMeeting.setHotelContactsList(payMeetingHotelContactsList); return Result.OK(payMeeting); } 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 552988a6..fbecad7f 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 @@ -3,9 +3,13 @@ package com.jero.meeting.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.util.List; + 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.jero.meeting.valid.group.StandardMeeting; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -203,6 +207,12 @@ public class PayMeeting implements Serializable { @ApiModelProperty(value = "酒店地址") private String hotelAddress; + /** + * 会议关联酒店联系人列表 + */ + @TableField(select = false) + private List hotelContactsList; + /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") 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 465da92d..f09a509a 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 @@ -27,6 +27,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; +import javax.transaction.Transactional; /** * @Description: 会议管理 @@ -35,6 +36,7 @@ import javax.annotation.Resource; * @Version: V1.0 */ @Service +@Transactional(rollbackOn = Exception.class) public class PayMeetingServiceImpl extends ServiceImpl implements IPayMeetingService { @Resource private ISysBaseAPI sysBaseApi; @@ -165,6 +167,9 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingHotelContacts::getMeetingId,id); + meetingHotelContactsService.remove(wrapper); } /** @@ -173,6 +178,9 @@ public class PayMeetingServiceImpl extends ServiceImpl ids) { removeByIds(ids); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(PayMeetingHotelContacts::getMeetingId,ids); + meetingHotelContactsService.remove(wrapper); } /**