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:
sunzheng
2024-07-11 14:52:56 +08:00
parent 82275544f2
commit 89cca9684b
4 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/24年6月变更.sql
+4 -3
View File
@@ -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_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 '所在城市', `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-否', `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 '酒店联系方式', `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_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
`create_time` datetime(0) 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_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE 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; SET FOREIGN_KEY_CHECKS = 1;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingHotelRecommend.java
+2 -2
View File
@@ -50,8 +50,8 @@ public class PayMeetingHotelRecommend implements Serializable {
private Integer isHold; private Integer isHold;
@ApiModelProperty(value = "曾举办的会议类型") @ApiModelProperty(value = "曾举办的会议类型")
@Dict(dicCode = "meeting_type") // @Dict(dicCode = "meeting_type")
private Integer meetingType; private String meetingType;
@ApiModelProperty(value = "酒店联系方式") @ApiModelProperty(value = "酒店联系方式")
private String contact; private String contact;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingHotelRecommendServiceImpl.java
+7 -12
View File
@@ -72,7 +72,7 @@ public class PayMeetingHotelRecommendServiceImpl extends ServiceImpl<PayMeetingH
queryWrapper.lambda().eq(PayMeetingHotelRecommend::getIsHold,isHold); queryWrapper.lambda().eq(PayMeetingHotelRecommend::getIsHold,isHold);
} }
if (StringUtils.isNotBlank(meetingType)) { if (StringUtils.isNotBlank(meetingType)) {
queryWrapper.lambda().eq(PayMeetingHotelRecommend::getMeetingType,meetingType); queryWrapper.lambda().like(PayMeetingHotelRecommend::getMeetingType,meetingType);
} }
if (StringUtils.isNotBlank(contact)) { if (StringUtils.isNotBlank(contact)) {
queryWrapper.lambda().like(PayMeetingHotelRecommend::getContact,contact); queryWrapper.lambda().like(PayMeetingHotelRecommend::getContact,contact);
@@ -91,8 +91,8 @@ public class PayMeetingHotelRecommendServiceImpl extends ServiceImpl<PayMeetingH
} }
// 是或否 // 是或否
Map<String, String> ynMap = sysBaseAPI.queryDictItemsMapByCode("yn"); Map<String, String> ynMap = sysBaseAPI.queryDictItemsMapByCode("yn");
// 会议类型 // // 会议类型
Map<String, String> meetingTypeMap = sysBaseAPI.queryDictItemsMapByCode("meeting_type"); // Map<String, String> meetingTypeMap = sysBaseAPI.queryDictItemsMapByCode("meeting_type");
int errorRowNum = 2; int errorRowNum = 2;
List<String> errorMessage = new ArrayList<>(); List<String> errorMessage = new ArrayList<>();
List<PayMeetingHotelRecommend> insertList = new ArrayList<>(); List<PayMeetingHotelRecommend> insertList = new ArrayList<>();
@@ -112,15 +112,10 @@ public class PayMeetingHotelRecommendServiceImpl extends ServiceImpl<PayMeetingH
int isHoldInt = Integer.parseInt(ynMap.get(isHold)); int isHoldInt = Integer.parseInt(ynMap.get(isHold));
payMeetingHotelRecommend.setIsHold(isHoldInt); payMeetingHotelRecommend.setIsHold(isHoldInt);
} }
// 曾举办会议类型 // 曾举办会议类型
String meetingType = submitExcel.getMeetingType(); if (ValidUtil.checkErrorList(errorList,"曾举办的会议类型")) {
if (StringUtils.isBlank(meetingType)){ String meetingType = submitExcel.getMeetingType();
payMeetingHotelRecommend.setMeetingType(meetingType);
}else if (!meetingTypeMap.containsKey(meetingType)){
errorMessage.add("第" + errorRowNum + "行：" + "会议类型不存在");
}else {
int meetingTypeInt = Integer.parseInt(meetingTypeMap.get(meetingType));
payMeetingHotelRecommend.setMeetingType(meetingTypeInt);
} }
// 推荐人 // 推荐人
if (ValidUtil.checkErrorList(errorList,"推荐人")) { if (ValidUtil.checkErrorList(errorList,"推荐人")) {
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/PayMeetingHotelRecommendExcel.java
+8 -11
View File
@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.io.Serializable; import java.io.Serializable;
@@ -21,7 +20,7 @@ public class PayMeetingHotelRecommendExcel implements Serializable {
@ApiModelProperty(value = "推荐人") @ApiModelProperty(value = "推荐人")
@Excel(name = "推荐人", width = 15) @Excel(name = "推荐人", width = 15)
@NotBlank(message = "推荐人不能为空") // @NotBlank(message = "推荐人不能为空")
@Size(max = 50, message = "推荐人最大为50字符") @Size(max = 50, message = "推荐人最大为50字符")
private String recommendPeople; private String recommendPeople;
@@ -33,37 +32,35 @@ public class PayMeetingHotelRecommendExcel implements Serializable {
@ApiModelProperty(value = "所在省份") @ApiModelProperty(value = "所在省份")
@Excel(name = "所在省份", width = 15) @Excel(name = "所在省份", width = 15)
@NotBlank(message = "所在省份不能为空") // @NotBlank(message = "所在省份不能为空")
@Size(max = 50, message = "所在省份最大为50字符") @Size(max = 50, message = "所在省份最大为50字符")
private String hotelProvince; private String hotelProvince;
@ApiModelProperty(value = "所在城市") @ApiModelProperty(value = "所在城市")
@Excel(name = "所在城市", width = 15) @Excel(name = "所在城市", width = 15)
@NotBlank(message = "所在城市不能为空") // @NotBlank(message = "所在城市不能为空")
@Size(max = 50, message = "所在城市最大为50字符") @Size(max = 50, message = "所在城市最大为50字符")
private String hotelCity; private String hotelCity;
@ApiModelProperty(value = "是否举办过标准院会议 1-是 0-否") @ApiModelProperty(value = "是否举办过标准院会议 1-是 0-否")
@Excel(name = "是否举办过标准院会议", width = 25) @Excel(name = "是否举办过标准院会议", width = 25)
@NotBlank(message = "是否举办过标准院会议不能为空") // @NotBlank(message = "是否举办过标准院会议不能为空")
private String isHold; private String isHold;
@ApiModelProperty(value = "曾举办的会议类型") @ApiModelProperty(value = "曾举办的会议类型")
@Excel(name = "曾举办的会议类型", width = 25) @Excel(name = "曾举办的会议类型", width = 25)
@NotBlank(message = "曾举办的会议类型不能为空") // @NotBlank(message = "曾举办的会议类型不能为空")
private String meetingType; private String meetingType;
@ApiModelProperty(value = "酒店联系方式") @ApiModelProperty(value = "酒店联系方式")
@Excel(name = "酒店联系方式", width = 15) @Excel(name = "酒店联系方式", width = 15)
@NotBlank(message = "酒店联系方式不能为空") // @NotBlank(message = "酒店联系方式不能为空")
@Size(max = 50, message = "酒店联系方式最大为50字符") @Size(max = 50, message = "酒店联系方式最大为50字符")
@Pattern(regexp = "^(1[3-9]\\d{9})$|^(0\\d{2,3}-\\d{7,8})$", message = "酒店联系方式格式错误") // @Pattern(regexp = "^(1[3-9]\\d{9})$|^(0\\d{2,3}-\\d{7,8})$", message = "酒店联系方式格式错误")
private String contact; private String contact;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
@Excel(name = "备注", width = 15) @Excel(name = "备注", width = 15)
@Size(max = 200, message = "备注最大为50字符") // @Size(max = 200, message = "备注最大为50字符")
private String remark; private String remark;
} }