LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 40551 会议详情--新增-是否需要送站选择是后,新出现的三个字段有以下问题

Browse Source
This commit is contained in:
lijiarao
2021-10-13 16:13:56 +08:00
parent 3646345b0b
commit 734168f069
5 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+10 -7
View File
@@ -790,34 +790,37 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//合作伙伴嘉宾只有最基础的参数所以不需要校验，只需要校验VIP，演讲嘉宾，特邀嘉宾
if (!guestType.equals(MeetingSubitemCommon.COOPERATIVE)) {
//先校验VIP，演讲嘉宾，特邀嘉宾的公共字段
ValidUtil.validate(internationalGuestVO);
List<String> validateReturnList = ValidUtil.validateReturnList(internationalGuestVO);
//用餐
Integer haveMeals = internationalGuestVO.getHaveMeals();
if (haveMeals.equals(MeetingSubitemCommon.HAVE_MEALS)) {
ValidUtil.validate(internationalGuestVO, HaveMeals.class);
validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, HaveMeals.class));
}
//接站
Integer pickUp = internationalGuestVO.getPickUp();
if (pickUp.equals(MeetingSubitemCommon.PICK_UP)) {
ValidUtil.validate(internationalGuestVO, PickUp.class);
validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, PickUp.class));
}
//送站
Integer deliveryStation = internationalGuestVO.getDeliveryStation();
if (deliveryStation.equals(MeetingSubitemCommon.DELIVERY_STATION)) {
ValidUtil.validate(internationalGuestVO, DeliveryStation.class);
validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, DeliveryStation.class));
}
//校验VIP，演讲嘉宾的公共字段
if (!guestType.equals(MeetingSubitemCommon.GUEST)) {
ValidUtil.validate(internationalGuestVO, Guest.class);
validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, Guest.class));
//校验VIP
if (guestType.equals(MeetingSubitemCommon.VIP)) {
ValidUtil.validate(internationalGuestVO, VIP.class);
validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, VIP.class));
Integer checkInHotel = internationalGuestVO.getCheckInHotel();
if (checkInHotel.equals(MeetingSubitemCommon.CHECK_IN_HOTEL)) {
ValidUtil.validate(internationalGuestVO, CheckInHotel.class);
validateReturnList.addAll(ValidUtil.validateReturnList(internationalGuestVO, CheckInHotel.class));
}
}
}
if (!validateReturnList.isEmpty()){
throw new JeroBootException(StringUtils.strip(validateReturnList.toString(),"[]"));
}
}
BeanUtils.copyProperties(internationalGuestVO, payMeetingSituation1);
// 参会人
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java
+2
View File
@@ -140,12 +140,14 @@ public class InternationalGuestVO {
@Excel(name = "离开站", width = 15)
@ApiModelProperty(value = "离开站")
@Size(max = 50,message = "离开站最大为50字符",groups = DeliveryStation.class)
@NotBlank(message = "离开站不能为空",groups = DeliveryStation.class)
private String departureStation;
/**离开班次*/
@Excel(name = "离开班次", width = 15)
@ApiModelProperty(value = "离开班次")
@Size(max = 50,message = "离开班次最大为50字符",groups = DeliveryStation.class)
@NotBlank(message = "离开班次不能为空",groups = DeliveryStation.class)
private String departureShift;
/**同行人*/