diff --git a/db/22年7月变更.sql b/db/22年7月变更.sql index 6cda953f..da3250db 100644 --- a/db/22年7月变更.sql +++ b/db/22年7月变更.sql @@ -19,7 +19,7 @@ CREATE TABLE `pay_meeting_question` ( UNIQUE INDEX `id`(`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会议征集问题' ROW_FORMAT = Dynamic; -CREATE TABLE `pay_meeting_standerd` ( +CREATE TABLE `pay_meeting_standard` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'id', `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期', 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 eb98f218..d96f3214 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 @@ -143,8 +143,10 @@ public class PayMeetingServiceImpl extends ServiceImpl collect = payMeetingVO.getQuestionList().stream().map(s -> s.setMeetingId(payMeeting.getId())).collect(Collectors.toList()); - payMeetingStandardService.saveBatch(collect); + if(!org.springframework.util.CollectionUtils.isEmpty(payMeetingVO.getQuestionList())) { + List collect = payMeetingVO.getQuestionList().stream().map(s -> s.setMeetingId(payMeeting.getId())).collect(Collectors.toList()); + payMeetingStandardService.saveBatch(collect); + } //如果酒店联系人列表不为空,就新增 if (!CollectionUtils.isEmpty(hotelContactsList)) { String meetingId = payMeeting.getId(); @@ -418,6 +420,28 @@ public class PayMeetingServiceImpl extends ServiceImpl list = payMeetingVO.getQuestionList().stream().collect(Collectors.groupingBy(PayMeetingStandard::getStandardNumber, Collectors.counting())).entrySet().stream() + .filter(entry -> entry.getValue() > 1) + .map(Map.Entry::getKey) + .collect(Collectors.toList()); + if (list.size() > 0) { + throw new JeroBootException("征集问题标准号重复!"); + } + + } + if (!ObjectUtils.isEmpty(payMeeting.getEndTimeAddQuestion())) { + if (payMeeting.getEndTimeAddQuestion().after(new Date())) { + payMeeting.setAddQuestionStatue(1); + } else { + payMeeting.setAddQuestionStatue(0); + } + } + } break; case MeetingCommon.INTERNATIONAL_MEETING: ValidUtil.validate(payMeetingVO, InternationalMeeting.class); @@ -490,26 +514,6 @@ public class PayMeetingServiceImpl extends ServiceImpl list= payMeetingVO.getQuestionList().stream().collect(Collectors.groupingBy(PayMeetingStandard::getStandardNumber,Collectors.counting())).entrySet().stream() - .filter(entry->entry.getValue()>1) - .map(Map.Entry::getKey) - .collect(Collectors.toList()); - if(list.size()>0){ - throw new JeroBootException("征集问题标准号重复!"); - } - - } - if(!ObjectUtils.isEmpty(payMeeting.getEndTimeAddQuestion())){ - if(payMeeting.getEndTimeAddQuestion().after(new Date())){ - payMeeting.setAddQuestionStatue(1); - }else { - payMeeting.setAddQuestionStatue(0); - } - } return payMeeting; }