diff --git a/db/24年6月变更.sql b/db/24年6月变更.sql index f6fe7f44..476562fd 100644 --- a/db/24年6月变更.sql +++ b/db/24年6月变更.sql @@ -173,14 +173,15 @@ CREATE TABLE `pay_meeting_hotel_recommend` ( `hotel_province` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所在省份', `hotel_city` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所在城市', `is_hold` tinyint(1) NULL DEFAULT NULL COMMENT '是否举办过标准院会议 1-是 0-否', - `meeting_type` tinyint(1) NULL DEFAULT NULL COMMENT '曾举办的会议类型', + `meeting_type` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '曾举办的会议类型', `contact` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '酒店联系方式', - `remark` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会议酒店推荐表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会议酒店推荐表' ROW_FORMAT = DYNAMIC; + SET FOREIGN_KEY_CHECKS = 1; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java index 614ddd81..eafc7e53 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java @@ -50,8 +50,8 @@ public class PayMeetingHotelRecommend implements Serializable { private Integer isHold; @ApiModelProperty(value = "曾举办的会议类型") - @Dict(dicCode = "meeting_type") - private Integer meetingType; +// @Dict(dicCode = "meeting_type") + private String meetingType; @ApiModelProperty(value = "酒店联系方式") private String contact; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingHotelRecommendServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingHotelRecommendServiceImpl.java index 99fe952a..a149f0f0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingHotelRecommendServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingHotelRecommendServiceImpl.java @@ -72,7 +72,7 @@ public class PayMeetingHotelRecommendServiceImpl extends ServiceImpl ynMap = sysBaseAPI.queryDictItemsMapByCode("yn"); - // 会议类型 - Map meetingTypeMap = sysBaseAPI.queryDictItemsMapByCode("meeting_type"); +// // 会议类型 +// Map meetingTypeMap = sysBaseAPI.queryDictItemsMapByCode("meeting_type"); int errorRowNum = 2; List errorMessage = new ArrayList<>(); List insertList = new ArrayList<>(); @@ -112,15 +112,10 @@ public class PayMeetingHotelRecommendServiceImpl extends ServiceImpl