update [PayMeetingSituation.java,CommonGuestVO.java]更改日期类型

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;
 

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<PayMeetingSituationMapper, PayMeetingSituation> implements IPayMeetingSituationService {
+	@Resource
+	private IPayContactsManagementService contactsManagementService;
 
+	@Resource
+	private IPayCompanyManagementTemporaryService companyManagementTemporaryService;
+
+	@Resource
+	private IPayContactsManagementTemporaryService contactsManagementTemporaryService;
 	/**
 	 * 保存
 	 */
@@ -32,12 +48,42 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 		BeanUtils.copyProperties(payMeetingSituation,meetingEntity);
 		//校验公共属性
 		ValidUtil.validate(meetingEntity);
+		//校验企业
+		String companyId = meetingEntity.getCompanyId();
+		PayCompanyManagementTemporary companyManagementTemporary = companyManagementTemporaryService.insertCompanyManagementTemporary(companyId);
+		meetingEntity.setCompanyTemporaryId(companyManagementTemporary.getId());
+		meetingEntity.setCompanyName(companyManagementTemporary.getCompanyName());
+
+		//校验企业联系人
+		String companyContactId = meetingEntity.getCompanyContactId();
+		PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
+		//校验是否是选择的企业的联系人
+		String companyId1 = contactsManagement.getCompanyId();
+		if (companyId1.equals(companyId)){
+			PayContactsManagementTemporary contactsManagementTemporary = contactsManagementTemporaryService.insertContactsManagementTemporary(companyContactId);
+			meetingEntity.setCompanyContactTemporaryId(contactsManagementTemporary.getId());
+			meetingEntity.setCompanyContactName(contactsManagementTemporary.getName());
+		}else {
+			throw new JeroBootException("企业联系人不是所选企业的企业联系人");
+		}
 		//判断身份
 		Integer identity = payMeetingSituation.getIdentity();
 		if (identity.equals(Integer.parseInt(MeetingSubitemCommon.CAN_HUI_REN))){
 			CommonPeopleVO commonPeopleVO = new CommonPeopleVO();
 			BeanUtils.copyProperties(payMeetingSituation,commonPeopleVO);
 			ValidUtil.validate(commonPeopleVO);
+			//校验邮寄联系人
+			String postContactId = commonPeopleVO.getPostContactId();
+			PayContactsManagement postContact = contactsManagementService.getById(postContactId);
+			//校验是否是选择的企业的联系人
+			String companyId2 = postContact.getCompanyId();
+			if (companyId2.equals(companyId)){
+				PayContactsManagementTemporary contactsManagementTemporary1 = contactsManagementTemporaryService.insertContactsManagementTemporary(postContactId);
+				commonPeopleVO.setPostContactTemporaryId(contactsManagementTemporary1.getId());
+				commonPeopleVO.setPostContactName(contactsManagementTemporary1.getName());
+			}else {
+				throw new JeroBootException("邮寄联系人不是所选企业的企业联系人");
+			}
 			BeanUtils.copyProperties(commonPeopleVO,payMeetingSituation1);
 		}
 		//到账

jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/CommonGuestVO.java

@@ -17,17 +17,17 @@ public class CommonGuestVO extends MeetingEntity{
     @ApiModelProperty(value = "是否入住协议酒店")
     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")
-    @ApiModelProperty(value = "入住酒店时间")
-    private java.util.Date inHotelTime;
+    /**抵达时间*/
+    @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;
 
-    /**离开酒店时间*/
-    @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")
-    @ApiModelProperty(value = "离开酒店时间")
-    private java.util.Date outHotelTime;
+    /**离开时间*/
+    @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;
 }