diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java index e327f146..269fbef7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java @@ -252,7 +252,7 @@ public class PayMeetingController extends JeroController()); //会议查询酒店联系人列表 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java index 9d4ca547..1d7adfce 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java @@ -27,6 +27,7 @@ import com.jero.project.service.IPayWorkingGroupService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; @@ -180,12 +181,12 @@ public class StandardsMeetingController extends JeroController paramMap = new HashMap<>(); - paramMap.put("ids",idList2); + paramMap.put("ids", StringUtils.strip(idList2.toString(),"[]")); AuthenticationUtils.get("/stablecrosstraining/stableCrossTraining/deleteBatchIncome",paramMap); } if (!idList3.isEmpty()) { HashMap paramMap = new HashMap<>(); - paramMap.put("ids",idList3); + paramMap.put("ids",StringUtils.strip(idList3.toString(),"[]")); AuthenticationUtils.get("/meetingNews/meetingNews/deleteBatchIncome",paramMap); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java index 57c25639..1d861261 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java @@ -289,22 +289,40 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl 0) { throw new JeroBootException("会议名称与标协会员系统重复"); } - boolean resFlag = meetingNewsService.save(meetingNews); - if (!resFlag) { - throw new JeroBootException("添加年会动态失败"); - } //创建时间/创建人/修改时间/修改人 - BaseUtil.create(meetingNews, "e9ca23d68d884d4ebb19d07889727dae"); + BaseUtil.update(meetingNews, "e9ca23d68d884d4ebb19d07889727dae"); //添加酒店信息 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(HotelManagement::getTrainingId, meetingNews.getId()); + List hotelManagements = hotelManagementService.list(queryWrapper); HotelManagement hotelManagement = new HotelManagement(); hotelManagement.setHotelList(meetingNews.getHotelList()); hotelManagement.setTrainingId(meetingNews.getId()) .setConferenceTheme(meetingNews.getConferenceTheme()).setHoldTime(meetingNews.getHoldTime()) .setPlace(meetingNews.getPlace()).setPlaceName(meetingNews.getPlaceName()) .setHotelName(meetingNews.getHotelName()).setAddress(meetingNews.getAddress()) - .setMeetingType(1); + .setMeetingType(1).setId(hotelManagements.get(0).getId()); hotelManagementService.edit(hotelManagement); - return meetingNewsService.updateById(meetingNews); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(MeetingNews::getId, meetingNews.getId()) + .set(StringUtils.isNotBlank(meetingNews.getConferenceTheme()), MeetingNews::getConferenceTheme, meetingNews.getConferenceTheme())//会议主题 + .set(StringUtils.isNotBlank(meetingNews.getHoldTime()), MeetingNews::getHoldTime, meetingNews.getHoldTime())//召开时间 + .set(StringUtils.isNotBlank(meetingNews.getPlace()), MeetingNews::getPlace, meetingNews.getPlace())//召开地点码 + .set(StringUtils.isNotBlank(meetingNews.getPlaceName()), MeetingNews::getPlaceName, meetingNews.getPlaceName())//省市区名称 + .set(StringUtils.isNotBlank(meetingNews.getIntroduction()), MeetingNews::getIntroduction, meetingNews.getIntroduction())//会议介绍 + .set(StringUtils.isNotBlank(meetingNews.getPropagandaMap()), MeetingNews::getPropagandaMap, meetingNews.getPropagandaMap())//宣传图 + .set(StringUtils.isNotBlank(meetingNews.getTraffic()), MeetingNews::getTraffic, meetingNews.getTraffic())//交通信息 + .set(StringUtils.isNotBlank(meetingNews.getDetails()), MeetingNews::getDetails, meetingNews.getDetails())//详情资讯 + .set(StringUtils.isNotBlank(meetingNews.getSchedule()), MeetingNews::getSchedule, meetingNews.getSchedule())//会议日程 + .set(StringUtils.isNotBlank(meetingNews.getAnnouncement()), MeetingNews::getAnnouncement, meetingNews.getAnnouncement())//会议通知 + .set(StringUtils.isNotBlank(meetingNews.getNewsReport()), MeetingNews::getNewsReport, meetingNews.getNewsReport())//新闻报道 + .set(StringUtils.isNotBlank(meetingNews.getConferenceRegistration()), MeetingNews::getConferenceRegistration, meetingNews.getConferenceRegistration())//报名链接 + .set(StringUtils.isNotBlank(meetingNews.getConferenceRegistrationImg()), MeetingNews::getConferenceRegistrationImg, meetingNews.getConferenceRegistrationImg())//报名二维码 + .set(meetingNews.getConvokeStartTime() != null, MeetingNews::getConvokeStartTime, meetingNews.getConvokeStartTime())//开始时间 + .set(meetingNews.getConvokeEndTime() != null, MeetingNews::getConvokeEndTime, meetingNews.getConvokeEndTime())//结束时间 + .set(MeetingNews::getUpdateBy, meetingNews.getUpdateBy())//修改人 + .set(MeetingNews::getUpdateTime, meetingNews.getUpdateTime());//修改时间 + return meetingNewsService.update(updateWrapper); } }