From ade7e08a80632f345ed67bca746d15d13726aea8 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 23 Sep 2021 11:52:52 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E6=A0=87=E5=8D=8F?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=97=B6=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StableCrossTraining.java | 59 ++++++++++++++- .../impl/StableCrossTrainingServiceImpl.java | 72 +++++++++++++++---- 2 files changed, 116 insertions(+), 15 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java index 27e0a694..d80d4bd0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/entity/StableCrossTraining.java @@ -1,5 +1,6 @@ package com.jero.standards.xuanguan.stablecrosstraining.entity; +import java.math.BigDecimal; import java.util.Date; import java.util.List; import java.util.Map; @@ -126,6 +127,62 @@ public class StableCrossTraining extends JeroEntity { @ApiModelProperty(value = "二维码") @TableField("qr_code") private String qrCode; + /**详细地址*/ + @Excel(name = "详细地址", width = 15) + @ApiModelProperty(value = "详细地址") + @TableField("address") + private String address; + + /**预计参加人数*/ + @Excel(name = "预计参加人数", width = 15) + @ApiModelProperty(value = "预计参加人数") + @TableField("estimated_number") + private String estimatedNumber; + + /**报名截止时间*/ + @Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "报名截止时间") + @TableField("register_deadline") + private java.util.Date registerDeadline; + + /**会议费用*/ + @Excel(name = "会议费用", width = 15) + @ApiModelProperty(value = "会议费用") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @TableField("meeting_costs") + private BigDecimal meetingCosts; + + /**会议费用（标协会员）*/ + @Excel(name = "会议费用（标协会员）", width = 15) + @ApiModelProperty(value = "会议费用（标协会员）") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @TableField("meeting_costs_vip") + private BigDecimal meetingCostsVip; + + /**会议负责人id*/ + @Excel(name = "会议负责人", width = 15,dictTable = "sys_user",dicText = "username",dicCode = "id") + @ApiModelProperty(value = "会议负责人id") + @TableField("director_id") + private String directorId; + + /**会议负责人*/ + @ApiModelProperty(value = "会议负责人") + @TableField("director_name") + private String directorName; + + /**会议负责人手机号*/ + @Excel(name = "会议负责人手机号", width = 15) + @ApiModelProperty(value = "会议负责人手机号") + @TableField("director_phone") + private String directorPhone; + + /**付款二维码*/ + @Excel(name = "付款二维码", width = 15) + @ApiModelProperty(value = "付款二维码") + @TableField("payment_qr_code") + private String paymentQrCode; // @ApiModelProperty(value = "创建人") @@ -181,7 +238,7 @@ public class StableCrossTraining extends JeroEntity { @ApiModelProperty("地址") @TableField(exist = false) - private String address; + private String hotelAddress; @ApiModelProperty("联系人") @TableField(exist = false) 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 9d78c3d9..370848f5 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 @@ -1,6 +1,9 @@ package com.jero.standards.xuanguan.stablecrosstraining.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -12,6 +15,8 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.*; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingHotelContacts; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.standards.jiudian.hotelManagement.entity.HotelManagement; import com.jero.standards.jiudian.hotelManagement.service.IHotelManagementService; import com.jero.standards.jiudian.hotelcontact.entity.HotelContact; @@ -28,6 +33,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.*; /** @@ -54,6 +60,8 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl hotelContactsList) { @@ -64,22 +72,49 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl fileIdList = new ArrayList<>(); + String meetingData = payMeeting.getMeetingData(); + stableCrossTraining.setMeetingFiles(meetingData); + if (StrUtil.isNotBlank(meetingData)){ + List strings = Arrays.asList(meetingData.split(",")); + List arrayList = new ArrayList<>(strings); + fileIdList.addAll(arrayList); + } + String meetingFiles = payMeeting.getMeetingFiles(); + stableCrossTraining.setMeetingNotifyFiles(meetingFiles); + if (StrUtil.isNotBlank(meetingFiles)){ + List strings = Arrays.asList(meetingFiles.split(",")); + List arrayList = new ArrayList<>(strings); + fileIdList.addAll(arrayList); + } + String paymentQrCode = payMeeting.getPaymentQrCode(); + stableCrossTraining.setPaymentQrCode(paymentQrCode); + if (StrUtil.isNotBlank(paymentQrCode)){ + fileIdList.add(paymentQrCode); + } + + stableCrossTraining.setAddress(payMeeting.getAddress()); + stableCrossTraining.setEstimatedNumber(payMeeting.getEstimatedNumber()); + stableCrossTraining.setRegisterDeadline(payMeeting.getRegisterDeadline()); + stableCrossTraining.setMeetingCosts(payMeeting.getMeetingCosts()); + stableCrossTraining.setMeetingCostsVip(payMeeting.getMeetingCostsVip()); + stableCrossTraining.setDirectorId(payMeeting.getDirectorId()); + stableCrossTraining.setDirectorName(payMeeting.getDirectorName()); + stableCrossTraining.setDirectorPhone(payMeeting.getDirectorPhone()); stableCrossTraining.setMeetingDescription(payMeeting.getMeetingContent()); stableCrossTraining.setRemark(payMeeting.getRemark()); Date startSignInTime = payMeeting.getStartSignInTime(); Date endSignInTime = payMeeting.getEndSignInTime(); - stableCrossTraining.setSignInTime(DateUtil.formatDateTime(startSignInTime)+"至"+DateUtil.formatDateTime(endSignInTime)); + stableCrossTraining.setSignInTime(DateUtil.formatDateTime(startSignInTime) + "至" + DateUtil.formatDateTime(endSignInTime)); stableCrossTraining.setSignInStart(startSignInTime); stableCrossTraining.setSignInEnd(endSignInTime); stableCrossTraining.setHotelName(payMeeting.getHotelName()); - stableCrossTraining.setAddress(payMeeting.getHotelAddress()); + stableCrossTraining.setHotelAddress(payMeeting.getHotelAddress()); stableCrossTraining.setMeetingApply(""); List hotelList = new ArrayList<>(); List hotelContactsList1 = payMeeting.getHotelContactsList(); @@ -90,6 +125,16 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl ossFiles = iossFileService.listByIds(fileIdList); + for (OSSFile ossFile : ossFiles) { + String url = ossFile.getUrl(); + String[] fileUrl = url.split("/"); + int length = fileUrl.length; + ossFile.setFileName(fileUrl[length - 1]); + } + AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/addStandardsFile",null,ossFiles); + } return stableCrossTraining; } @@ -101,9 +146,9 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(StableCrossTraining::getName,stableCrossTraining.getName()); + wrapper.eq(StableCrossTraining::getName, stableCrossTraining.getName()); int count = stableCrossTrainingService.count(wrapper); - if (count>0){ + if (count > 0) { throw new JeroBootException("会议名称与标协会员系统重复"); } //配置培训状态 @@ -118,7 +163,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl hotelContactsList){ + public Boolean edit(PayMeeting payMeeting, List hotelContactsList) { StableCrossTraining stableCrossTraining = push(payMeeting, hotelContactsList); // 会议名称唯一校验 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(StableCrossTraining::getName,stableCrossTraining.getName()); - wrapper.ne(StableCrossTraining::getId,stableCrossTraining.getId()); + wrapper.eq(StableCrossTraining::getName, stableCrossTraining.getName()); + wrapper.ne(StableCrossTraining::getId, stableCrossTraining.getId()); int count = stableCrossTrainingService.count(wrapper); - if (count>0){ + if (count > 0) { throw new JeroBootException("会议名称与标协会员系统重复"); } //配置培训状态 @@ -208,7 +253,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl