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 7328b298..fc697f2a 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 @@ -233,15 +233,15 @@ public class PayMeeting implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsVip; - /**会议费用(2个课题)*/ - @Excel(name = "会议费用(2个课题)", width = 15) - @ApiModelProperty(value = "会议费用(2个课题)") + /**1个及以下专题研讨费用*/ + @Excel(name = "1个及以下专题研讨费用", width = 15) + @ApiModelProperty(value = "1个及以下专题研讨费用") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsTwoTopic; - /**会议费用(3个及以上)*/ - @Excel(name = "会议费用(3个及以上)", width = 15) - @ApiModelProperty(value = "会议费用(3个及以上)") + /**2个及以上专题研讨费用*/ + @Excel(name = "2个及以上专题研讨费用", width = 15) + @ApiModelProperty(value = "2个及以上专题研讨费用") @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsThreeTopic; 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 c6a0b53d..cb369f6f 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 @@ -234,19 +234,19 @@ public class PayMeetingVO implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsVip; - /**会议费用(2个课题)*/ - @Excel(name = "会议费用(2个课题)", width = 15) - @ApiModelProperty(value = "会议费用(2个课题)") - @NotNull(message = "会议费用(2个课题)不能为空",groups = InternationalMeetingWasic.class) - @DecimalMax(value = "9999999999.99",message = "会议费用(2个课题)格式错误",groups = InternationalMeetingWasic.class) + /**1个及以下专题研讨费用*/ + @Excel(name = "1个及以下专题研讨费用", width = 15) + @ApiModelProperty(value = "1个及以下专题研讨费用") + @NotNull(message = "1个及以下专题研讨费用不能为空",groups = InternationalMeetingWasic.class) + @DecimalMax(value = "9999999999.99",message = "1个及以下专题研讨费用格式错误",groups = InternationalMeetingWasic.class) @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsTwoTopic; - /**会议费用(3个及以上)*/ - @Excel(name = "会议费用(3个及以上)", width = 15) - @ApiModelProperty(value = "会议费用(3个及以上)") - @NotNull(message = "会议费用(3个及以上)不能为空",groups = InternationalMeetingWasic.class) - @DecimalMax(value = "9999999999.99",message = "会议费用(3个及以上)格式错误",groups = InternationalMeetingWasic.class) + /**2个及以上专题研讨费用*/ + @Excel(name = "2个及以上专题研讨费用", width = 15) + @ApiModelProperty(value = "2个及以上专题研讨费用") + @NotNull(message = "2个及以上专题研讨费用不能为空",groups = InternationalMeetingWasic.class) + @DecimalMax(value = "9999999999.99",message = "2个及以上专题研讨费用格式错误",groups = InternationalMeetingWasic.class) @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal meetingCostsThreeTopic; 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 5e1e0ac2..20203a84 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 @@ -77,12 +77,12 @@ public class InternationalMeetingExcel { @Excel(name = "关联课题", width = 15, dicCode = "linkTopics") private String linkTopics; - /**会议费用(2个课题)*/ - @Excel(name = "会议费用(2个课题)", width = 15) + /**1个及以下专题研讨费用*/ + @Excel(name = "1个及以下专题研讨费用", width = 15) private BigDecimal meetingCostsTwoTopic; - /**会议费用(3个及以上)*/ - @Excel(name = "会议费用(3个及以上)", width = 15) + /**2个及以上专题研讨费用*/ + @Excel(name = "2个及以上专题研讨费用", width = 15) private BigDecimal meetingCostsThreeTopic; /**会议负责人*/