diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql index 20d9eb56..35cf57b2 100644 --- a/db/23年7月变更.sql +++ b/db/23年7月变更.sql @@ -59,3 +59,4 @@ INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `com INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1679782718844522497', '1679684027710234625', '查询', '', NULL, NULL, NULL, 2, 'sysNotice:pageList', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2023-07-14 17:19:44', 'LKGLZ', '2023-07-14 17:25:16', 0, 0, '1', 0); INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`) VALUES ('1679684027710234625', '5c8042bd6c601270b2bbd9b20bccc68b', '公告管理', '/isystem/noticeList', 'modules/notice/SysNoticeList', NULL, NULL, 1, NULL, '1', 3.00, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2023-07-14 10:47:34', NULL, NULL, 0, 0, '1', 0); +ALTER TABLE pay_meeting ADD file_ids varchar(1000) COMMENT '会议文件'; \ No newline at end of file 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 1413c8db..51fa73f0 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 @@ -255,6 +255,10 @@ public class PayMeeting implements Serializable { @ApiModelProperty(value = "会议通知文件") private String meetingFiles; + /**会议通知文件*/ + @ApiModelProperty(value = "会议文件") + private String fileIds; + /**会议资料*/ @ApiModelProperty(value = "会议资料") private String meetingData; 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 f950e796..01eb9bbe 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 @@ -178,6 +178,12 @@ public class PayMeetingServiceImpl extends ServiceImpl strings = Arrays.asList(fileIds.split(",")); + List arrayList = new ArrayList<>(strings); + fileIdList.addAll(arrayList); + } pushStandardsFiles(fileIdList); } } @@ -339,6 +345,12 @@ public class PayMeetingServiceImpl extends ServiceImpl strings = Arrays.asList(fileIds.split(",")); + List arrayList = new ArrayList<>(strings); + fileIdList.addAll(arrayList); + } pushStandardsFiles(fileIdList); } } 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 21f16072..f054dc65 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 @@ -267,6 +267,11 @@ public class PayMeetingVO implements Serializable { @Size(max = 1000, message = "会议通知文件数量超出最大限制") private String meetingFiles; + /**会议通知文件*/ + @ApiModelProperty(value = "会议文件") + @Size(max = 1000, message = "会议文件数量超出最大限制") + private String fileIds; + /**会议资料*/ @ApiModelProperty(value = "会议资料") @Size(max = 1000, message = "会议资料数量超出最大限制") diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java index 51234485..66b52622 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java @@ -11,6 +11,7 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.io.Serializable; import java.util.Date; @@ -47,6 +48,7 @@ public class SysNotice implements Serializable { @ApiModelProperty("公告内容") private String noticeContent; @ApiModelProperty("附件") + @Size(max = 300, message = "附件数量超出最大限制") private String noticeFile; @ApiModelProperty("状态(1-启用,0-禁用)") @NotNull(message = "状态不能为空")