diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java index d69ae4b9..b346d7fc 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java @@ -203,7 +203,7 @@ public class CommitteeMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java index b31b0f02..7237062d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingController.java @@ -190,7 +190,7 @@ public class CouncilMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COUNCIL_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index e63fd060..7195a689 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java @@ -201,7 +201,7 @@ public class InternalMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java index 71f19fc5..f38a86c3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java @@ -201,7 +201,7 @@ public class OtherMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.OTHER_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.OTHER_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } 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 9ab8dcb6..4bde1fc3 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 @@ -27,6 +27,7 @@ import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.*; +import com.jero.meeting.mapper.PayMeetingGuestsFileMapper; import com.jero.meeting.service.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -101,6 +102,8 @@ public class PayMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } 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 3338acaa..fe66ff2b 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 @@ -270,7 +270,7 @@ public class StandardsMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.STANDARD_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.STANDARD_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java index ff35e297..8cb8f75c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java @@ -208,7 +208,7 @@ public class WorkGroupMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.WORKING_GROUP_MEETING_INT, true); + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.WORKING_GROUP_MEETING_INT, false); return Result.OK("上传资料成功!",strings); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 70530916..b75fb1aa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java @@ -73,7 +73,7 @@ public interface IPayMeetingService extends IService { IPage queryMeetingSummary(MeetingSummary meetingSummary, Integer pageNo, Integer pageSize, HttpServletRequest req); - List uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon, Boolean saveFileFlag); + List uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon, Boolean isGuestsUpload); /** * 上传会议纪要 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 6767e2c0..4fafe2fa 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 @@ -1,5 +1,6 @@ package com.jero.meeting.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -59,6 +60,7 @@ import com.jero.project.service.IPayWorkingGroupSubItemService; import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining; import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.util.Strings; import org.apache.shiro.SecurityUtils; import org.apache.shiro.util.CollectionUtils; import org.jetbrains.annotations.NotNull; @@ -1010,12 +1012,12 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(PayMeetingGuestsFile::getMeetingId,meetingId); - List payMeetingGuestsFiles = meetingGuestsFileMapper.selectList(wrapper1); - List collect = payMeetingGuestsFiles.stream().map(PayMeetingGuestsFile::getFileId).collect(Collectors.toList()); - meetingDataList.addAll(collect); - meeting.setMeetingData(String.join(",",meetingDataList)); + //LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + //wrapper1.eq(PayMeetingGuestsFile::getMeetingId,meetingId); + //List payMeetingGuestsFiles = meetingGuestsFileMapper.selectList(wrapper1); + //List collect = payMeetingGuestsFiles.stream().map(PayMeetingGuestsFile::getFileId).collect(Collectors.toList()); + //meetingDataList.addAll(collect); + //meeting.setMeetingData(String.join(",",meetingDataList)); } return pageList; } @@ -1105,7 +1107,7 @@ public class PayMeetingServiceImpl extends ServiceImpl uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon, Boolean saveFileFlag) { + public List uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon, Boolean isGuestsUpload) { List listMsg = new ArrayList<>(); String id = uploadFileVO.getId(); LambdaQueryWrapper payMeetingLambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -1119,13 +1121,26 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(PayMeeting::getId, id); - wrapper.set(PayMeeting::getMeetingData, fileIds); - update(wrapper); - } List meetingFileIdList = Arrays.asList(fileIds.split(",")); + if (isGuestsUpload){ + String meetingData = payMeeting.getMeetingData(); + if (StringUtils.isNotBlank(meetingData)) { + List oldMeetingDataList = Arrays.asList(meetingData.split(",")); + oldMeetingDataList.addAll(meetingFileIdList); + meetingFileIdList = oldMeetingDataList; + fileIds = String.join(",", meetingFileIdList); + } + } + //删除嘉宾文件 + LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); + deleteWrapper.eq(PayMeetingGuestsFile::getMeetingId,id); + deleteWrapper.notIn(PayMeetingGuestsFile::getFileId,meetingFileIdList); + meetingGuestsFileMapper.delete(deleteWrapper); + + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(PayMeeting::getId, id); + wrapper.set(PayMeeting::getMeetingData, fileIds); + update(wrapper); //如果过滤后为空则不发邮件 if (meetingFileIdList.isEmpty()) { return listMsg; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 8d76203c..6dcaa4a2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -80,6 +80,7 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService; import com.jero.util.ObjRecordUtil; import com.jero.util.module.ObjRecordUtilModule; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.util.Strings; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; @@ -1815,7 +1816,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl meetingDataList = new ArrayList<>(); + if (StringUtils.isNotBlank(meetingData)){ + meetingDataList = Arrays.asList(meetingData.split(",")); + meetingDataList.removeAll(fileIdList); + } + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(PayMeeting::getId, meetingId); + updateWrapper.set(PayMeeting::getMeetingData, String.join(",",meetingDataList)); + meetingService.update(updateWrapper); } }