From 55650ad71c4bdbb26a84c06d5a0ade5ac6247e07 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 8 Sep 2021 19:36:52 +0800 Subject: [PATCH] =?UTF-8?q?update=20[PayMeetingSituation.java,CommonGuestV?= =?UTF-8?q?O.java]=E6=9B=B4=E6=94=B9=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/entity/PayMeetingSituation.java | 32 ++++++------- .../impl/PayMeetingSituationServiceImpl.java | 46 +++++++++++++++++++ .../com/jero/meeting/vo/CommonGuestVO.java | 24 +++++----- 3 files changed, 74 insertions(+), 28 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java index 7c4fd664..613e9ce5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java @@ -43,8 +43,8 @@ public class PayMeetingSituation implements Serializable { private String createBy; /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "创建日期") private java.util.Date createTime; @@ -53,8 +53,8 @@ public class PayMeetingSituation implements Serializable { private String updateBy; /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; @@ -161,16 +161,16 @@ public class PayMeetingSituation implements Serializable { private Integer checkInHotel; /**入住酒店时间*/ - @Excel(name = "入住酒店时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "入住酒店时间", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "入住酒店时间") private java.util.Date inHotelTime; /**离开酒店时间*/ - @Excel(name = "离开酒店时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "离开酒店时间", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "离开酒店时间") private java.util.Date outHotelTime; @@ -180,9 +180,9 @@ public class PayMeetingSituation implements Serializable { private String roomLayout; /**抵达时间*/ - @Excel(name = "抵达时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "抵达时间", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "抵达时间") private java.util.Date arrivalTime; @@ -202,9 +202,9 @@ public class PayMeetingSituation implements Serializable { private Integer deliveryStation; /**离开时间*/ - @Excel(name = "离开时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @Excel(name = "离开时间", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "离开时间") private java.util.Date departureTime; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 58b8917b..db51cbba 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1,6 +1,9 @@ package com.jero.meeting.service.impl; +import com.jero.common.exception.JeroBootException; import com.jero.common.util.ValidUtil; +import com.jero.company.entity.PayContactsManagement; +import com.jero.company.service.IPayContactsManagementService; import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.mapper.PayMeetingSituationMapper; @@ -8,11 +11,17 @@ import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.CommonPeopleVO; import com.jero.meeting.vo.MeetingEntity; import com.jero.project.common.PayProjectCommon; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; + /** * @Description: 会议报名信息 * @Author: jero-boot @@ -21,7 +30,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; */ @Service public class PayMeetingSituationServiceImpl extends ServiceImpl implements IPayMeetingSituationService { + @Resource + private IPayContactsManagementService contactsManagementService; + @Resource + private IPayCompanyManagementTemporaryService companyManagementTemporaryService; + + @Resource + private IPayContactsManagementTemporaryService contactsManagementTemporaryService; /** * 保存 */ @@ -32,12 +48,42 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl