From 4ca3d33291b5d5c87675fe3cd553515fbf7af97e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 3 Sep 2021 14:44:11 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/meeting/common/MeetingCommon.java | 6 +++--- .../jero/meeting/service/impl/PayMeetingServiceImpl.java | 7 ++++--- .../src/main/java/com/jero/meeting/vo/PayMeetingVO.java | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java index 820f4db5..77480650 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java @@ -9,15 +9,15 @@ public class MeetingCommon { /** * 工作组会议 */ - public final static String WORKING_GROUP_MEETING = "工作组会议"; + public final static String WORKING_GROUP_MEETING = "1"; /** * 标协会议 */ - public final static String STANDARD_MEETING = "标协会议"; + public final static String STANDARD_MEETING = "2"; /** * 国际研讨会 */ - public final static String INTERNATIONAL_MEETING = "国际研讨会"; + public final static String INTERNATIONAL_MEETING = "3"; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index cdf24409..dbbfd155 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.meeting.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; @@ -58,11 +59,11 @@ public class PayMeetingServiceImpl extends ServiceImpl meetingTypeMap = sysBaseApi.queryDictItemsMapByCode("meeting_type"); - if (!meetingTypeMap.containsKey(meetingType)) { + String type = sysBaseApi.translateDict("meeting_type", meetingType); + if (StrUtil.isBlank(type)) { throw new JeroBootException("会议类型不存在"); }else { - payMeeting.setMeetingType(Integer.valueOf(meetingTypeMap.get(meetingType))); + payMeeting.setMeetingType(Integer.valueOf(meetingType)); } //判断会议联系人 String directorId = payMeetingVO.getDirectorId(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java index 10624a64..fb195f81 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java @@ -46,7 +46,7 @@ public class PayMeetingVO implements Serializable { /**标协会议类型*/ @Excel(name = "标协会议类型", width = 15,dicCode = "standard_meeting_type") @ApiModelProperty(value = "标协会议类型") - @NotBlank(message = "会议类型不能为空", groups = StandardMeeting.class) + @NotBlank(message = "标协会议类型不能为空", groups = StandardMeeting.class) private String tbMeetingType; /**工作组项目id*/