add 标协会议返回酒店联系人

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<PayMeeting, IPayMeeting
 	private IPayMeetingService payMeetingService;
 	@Resource
 	private ISysBaseAPI sysBaseApi;
+	 @Resource
+	 private IPayMeetingHotelContactsService meetingHotelContactsService;
 	
 	/**
 	 * 分页列表查询
@@ -57,10 +66,21 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
 		Page<PayMeeting> page = new Page<>(pageNo, pageSize);
 		IPage<PayMeeting> 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<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
+				wrapper.eq(PayMeetingHotelContacts::getMeetingId,meeting.getId());
+				List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
+				meeting.setHotelContactsList(payMeetingHotelContactsList);
+			}
 		}
+
 		return Result.OK(pageList);
 	}
 
@@ -132,6 +152,17 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
 		if(payMeeting==null) {
 			return Result.error("未找到对应数据");
 		}
+		//查询会议负责人
+		LoginUser user = sysBaseApi.getUserById(payMeeting.getDirectorId());
+		payMeeting.setDirectorName(user.getUsername());
+		payMeeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
+		PayMeetingVO payMeetingVO = new PayMeetingVO();
+		BeanUtils.copyProperties(payMeetingVO,payMeeting);
+		//查询酒店联系人列表
+		LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PayMeetingHotelContacts::getMeetingId,payMeeting.getId());
+		List<PayMeetingHotelContacts> payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper);
+		payMeeting.setHotelContactsList(payMeetingHotelContactsList);
 		return Result.OK(payMeeting);
 	}
 

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<PayMeetingHotelContacts> hotelContactsList;
+
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")

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<PayMeetingMapper, PayMeeting> implements IPayMeetingService {
 	@Resource
 	private ISysBaseAPI sysBaseApi;
@@ -165,6 +167,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 	@Override
     public void deleteById(String id) {
         removeById(id);
+        LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(PayMeetingHotelContacts::getMeetingId,id);
+		meetingHotelContactsService.remove(wrapper);
     }
 
 	/**
@@ -173,6 +178,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 	@Override
     public void deleteByIds(List<String> ids) {
         removeByIds(ids);
+		LambdaQueryWrapper<PayMeetingHotelContacts> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(PayMeetingHotelContacts::getMeetingId,ids);
+		meetingHotelContactsService.remove(wrapper);
     }
 
 	/**