From 055e278afce3496bc26a8161997419a5308d0198 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 6 Nov 2023 17:49:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/config/shiro/ShiroConfig.java | 2 +- .../meeting/controller/InternalMeetingController.java | 4 ++-- .../src/main/java/com/jero/meeting/entity/PayMeeting.java | 8 ++++---- .../java/com/jero/meeting/entity/PayMeetingSituation.java | 8 ++++---- .../service/impl/PayMeetingSituationServiceImpl.java | 4 ++-- .../java/com/jero/meeting/vo/InternationalGuestVO.java | 8 ++++---- .../java/com/jero/meeting/vo/PayMeetingSituationVO.java | 8 ++++---- .../src/main/java/com/jero/meeting/vo/PayMeetingVO.java | 8 ++++---- .../jero/meeting/vo/excel/InternationalMeetingExcel.java | 4 ++-- .../meeting/vo/excel/InternationalSituationExcel.java | 4 ++-- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index cfec9343..60449e9d 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -138,7 +138,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/sys/common/download/**","anon");//下载接口 filterChainDefinitionMap.put("/sys/oss/file/queryById","anon");//通过id查询文件 filterChainDefinitionMap.put("/meeting/internalMeetingSituation/checkMember","anon");//校验是否为会员单位 - filterChainDefinitionMap.put("/meeting/internalMeeting/getLinkTopics","anon");//查询关联课题 + filterChainDefinitionMap.put("/meeting/internalMeeting/getLinkTopics","anon");//查询关联会议 filterChainDefinitionMap.put("/", "anon"); filterChainDefinitionMap.put("/doc.html", "anon"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index c3ebef08..dde6e8b5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -231,9 +231,9 @@ public class InternalMeetingController extends JeroController> getLinkTopics(@RequestParam(name = "id") String id) { List linkTopics = payMeetingService.getLinkTopics(id); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index fc697f2a..a37e16a9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -214,11 +214,11 @@ public class PayMeeting implements Serializable { @ApiModelProperty(value = "是否WASIC") private Integer isWasic; - /**关联课题*/ + /**关联会议*/ @Dict(dicCode = "linkTopics") - @Excel(name = "关联课题", width = 15) - @ApiModelProperty(value = "关联课题") - @Size(max = 50, message = "关联课题最多为50个字符") + @Excel(name = "关联会议", width = 15) + @ApiModelProperty(value = "关联会议") + @Size(max = 50, message = "关联会议最多为50个字符") private String linkTopics; /**会议费用*/ 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 25e55169..0c95548c 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 @@ -125,11 +125,11 @@ public class PayMeetingSituation implements Serializable { @Max(value = 4,groups = Guest.class) private Integer guestType; - /**课题名称*/ - @Excel(name = "课题名称", width = 15) + /**参加会议名称*/ + @Excel(name = "参加会议名称", width = 15) @Dict(dicCode = "linkTopics") - @ApiModelProperty(value = "课题名称") - @Size(max = 50, message = "课题名称最多为50个字符") + @ApiModelProperty(value = "参加会议名称") + @Size(max = 50, message = "参加会议名称最多为50个字符") private String choiceTopic; /**演讲题目*/ 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 cb33b73a..8726df0b 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 @@ -1170,7 +1170,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl linkTopicList = Arrays.asList(linkTopics.split(",")); //先判断是否有免费专题 @@ -1178,7 +1178,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl choiceTopicList = Arrays.stream(choiceTopic.split(",")).distinct().collect(Collectors.toList()); if (!linkTopicList.containsAll(choiceTopicList)) { - throw new JeroBootException("课题名称选择错误"); + throw new JeroBootException("参加会议名称选择错误"); } //免费会议去除 choiceTopicList.removeIf(next -> "6".equals(next) || "99".equals(next) || "8".equals(next)); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java index 57acdeb9..16c49730 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java @@ -23,11 +23,11 @@ public class InternationalGuestVO { @Max(value = 4) private Integer guestType; - /**课题名称*/ - @Excel(name = "课题名称", width = 15) + /**参加会议名称*/ + @Excel(name = "参加会议名称", width = 15) @Dict(dicCode = "linkTopics") - @ApiModelProperty(value = "课题名称") - @Size(max = 50, message = "课题名称最多为50个字符") + @ApiModelProperty(value = "参加会议名称") + @Size(max = 50, message = "参加会议名称最多为50个字符") private String choiceTopic; /**演讲题目*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java index 6d344b5e..ad9e1a67 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java @@ -111,11 +111,11 @@ public class PayMeetingSituationVO { @Max(value = 4,groups = Guest.class) private Integer guestType; - /**课题名称*/ - @Excel(name = "课题名称", width = 15) + /**参加会议名称*/ + @Excel(name = "参加会议名称", width = 15) @Dict(dicCode = "linkTopics") - @ApiModelProperty(value = "课题名称") - @Size(max = 50, message = "课题名称最多为50个字符") + @ApiModelProperty(value = "参加会议名称") + @Size(max = 50, message = "参加会议名称最多为50个字符") private String choiceTopic; /**演讲题目*/ 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 cb369f6f..c3e309b5 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 @@ -212,11 +212,11 @@ public class PayMeetingVO implements Serializable { @Range(min = 0, max = 1,message = "是否WASIC格式不正确",groups = InternationalMeeting.class) private Integer isWasic; - /**关联课题*/ - @Excel(name = "关联课题", width = 15) + /**关联会议*/ + @Excel(name = "关联会议", width = 15) @Dict(dicCode = "linkTopics") - @ApiModelProperty(value = "关联课题") - @Size(max = 50, message = "关联课题最多为50个字符") + @ApiModelProperty(value = "关联会议") + @Size(max = 50, message = "关联会议最多为50个字符") private String linkTopics; /**会议费用*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java index 20203a84..271704e6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java @@ -73,8 +73,8 @@ public class InternationalMeetingExcel { @Excel(name = "是否WASIC", width = 15, dicCode = "yn") private Integer isWasic; - /**关联课题*/ - @Excel(name = "关联课题", width = 15, dicCode = "linkTopics") + /**关联会议*/ + @Excel(name = "关联会议", width = 15, dicCode = "linkTopics") private String linkTopics; /**1个及以下专题研讨费用*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java index 595f23b5..f5591c87 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java @@ -47,8 +47,8 @@ public class InternationalSituationExcel extends SituationBaseExcel { @Excel(name = "嘉宾类型", width = 15,dicCode = "guest_type") private Integer guestType; - /**课题名称*/ - @Excel(name = "课题名称", width = 15, dicCode = "linkTopics") + /**参加会议名称*/ + @Excel(name = "参加会议名称", width = 15, dicCode = "linkTopics") private String choiceTopic; /**演讲题目*/