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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangqinlin
2021-09-06 18:21:10 +08:00
parent c5dd2bafee 2d8c9d93e1
commit 2ef4b82c02
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+1 -1
View File
@@ -210,7 +210,7 @@ public class PayMeeting implements Serializable {
/** /**
* 会议关联酒店联系人列表 * 会议关联酒店联系人列表
*/ */
@TableField(select = false) @TableField(exist = false)
private List<PayMeetingHotelContacts> hotelContactsList; private List<PayMeetingHotelContacts> hotelContactsList;
/**备注*/ /**备注*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+2 -2
View File
@@ -134,9 +134,9 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
case MeetingCommon.STANDARD_MEETING: case MeetingCommon.STANDARD_MEETING:
ValidUtil.validate(payMeetingVO, StandardMeeting.class); ValidUtil.validate(payMeetingVO, StandardMeeting.class);
//标协会议类型 //标协会议类型
Map<String, String> standardMeetingType = sysBaseApi.queryDictItemsMapByCode("standard_meeting_type");
String tbMeetingType = payMeetingVO.getTbMeetingType(); String tbMeetingType = payMeetingVO.getTbMeetingType();
if (!standardMeetingType.containsKey(tbMeetingType)){ String standardMeetingType = sysBaseApi.translateDict("standard_meeting_type", tbMeetingType);
if (standardMeetingType == null){
throw new JeroBootException("标协会议类型不存在"); throw new JeroBootException("标协会议类型不存在");
} }
hotelContactsList = payMeetingVO.getHotelContactsList(); hotelContactsList = payMeetingVO.getHotelContactsList();