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

update 字段命名修改

Browse Source
This commit is contained in:
lijiarao
2023-11-06 17:49:59 +08:00
parent d307a01f99
commit 055e278afc
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+1 -1
View File
@@ -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");
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+2 -2
View File
@@ -231,9 +231,9 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
}
/**
* 查询关联课题
* 查询关联会议
*/
@ApiOperation(value = "查询关联课题")
@ApiOperation(value = "查询关联会议")
@GetMapping(value = "/getLinkTopics")
public Result<List<DictModel>> getLinkTopics(@RequestParam(name = "id") String id) {
List<DictModel> linkTopics = payMeetingService.getLinkTopics(id);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+4 -4
View File
@@ -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;
/**会议费用*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+4 -4
View File
@@ -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;
/**演讲题目*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+2 -2
View File
@@ -1170,7 +1170,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (PayProjectCommon.YES.equals(isWasic)){
String linkTopics = payMeeting.getLinkTopics();
if (StringUtils.isBlank(linkTopics)) {
throw new JeroBootException("课题名称选择错误");
throw new JeroBootException("参加会议名称选择错误");
}
List<String> linkTopicList = Arrays.asList(linkTopics.split(","));
//先判断是否有免费专题
@@ -1178,7 +1178,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
payMeetingSituation1.setChoiceTopic(choiceTopic);
List<String> 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));
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/InternationalGuestVO.java
+4 -4
View File
@@ -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;
/**演讲题目*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingSituationVO.java
+4 -4
View File
@@ -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;
/**演讲题目*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+4 -4
View File
@@ -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;
/**会议费用*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java
+2 -2
View File
@@ -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个及以下专题研讨费用*/
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalSituationExcel.java
+2 -2
View File
@@ -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;
/**演讲题目*/