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 8dac46cd..bca796ec 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 @@ -134,6 +134,18 @@ public class PayMeetingServiceImpl extends ServiceImpl fileIdList = new ArrayList<>(); + String meetingFiles = payMeeting.getMeetingFiles(); + if (StrUtil.isNotBlank(meetingFiles)){ + List strings = Arrays.asList(meetingFiles.split(",")); + List arrayList = new ArrayList<>(strings); + fileIdList.addAll(arrayList); + } + String paymentQrCode = payMeeting.getPaymentQrCode(); + if (StrUtil.isNotBlank(paymentQrCode)){ + fileIdList.add(paymentQrCode); + } + pushStandardsFiles(fileIdList); } //工作组会议发送通知 if (Objects.equals(payMeeting.getMeetingType(), Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) { @@ -155,6 +167,23 @@ public class PayMeetingServiceImpl extends ServiceImpl ids) { + if (!ids.isEmpty()){ + List ossFiles = iossFileService.listByIds(ids); + 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); + } + } + /** * 工作组创建会议通知 * @@ -228,6 +257,18 @@ public class PayMeetingServiceImpl extends ServiceImpl fileIdList = new ArrayList<>(); + String meetingFiles = payMeeting.getMeetingFiles(); + if (StrUtil.isNotBlank(meetingFiles)){ + List strings = Arrays.asList(meetingFiles.split(",")); + List arrayList = new ArrayList<>(strings); + fileIdList.addAll(arrayList); + } + String paymentQrCode = payMeeting.getPaymentQrCode(); + if (StrUtil.isNotBlank(paymentQrCode)){ + fileIdList.add(paymentQrCode); + } + pushStandardsFiles(fileIdList); } } @@ -590,14 +631,7 @@ public class PayMeetingServiceImpl extends ServiceImpl ossFiles = iossFileService.listByIds(meetingFileIdList); - 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); + pushStandardsFiles(meetingFileIdList); StableCrossTraining stableCrossTraining = new StableCrossTraining(); stableCrossTraining.setId(id); stableCrossTraining.setMeetingFiles(fileIds); 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 7bb6f0b3..881f8dad 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 @@ -77,26 +77,14 @@ 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()); @@ -125,16 +113,6 @@ 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; }