From 83766f29ec42d6f9aa22b529269c2d4ed85a9b52 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 21 Oct 2021 16:02:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommitteeMeetingController.java | 12 +- .../controller/InternalMeetingController.java | 10 +- .../controller/OtherMeetingController.java | 10 +- .../controller/PayMeetingController.java | 24 +- .../StandardsMeetingController.java | 10 +- .../WorkGroupMeetingController.java | 10 +- .../service/impl/PayMeetingServiceImpl.java | 1025 +++++++++-------- .../PayMemberProjectController.java | 400 +++---- .../PayMemberProjectSubitemController.java | 17 +- 9 files changed, 760 insertions(+), 758 deletions(-) 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 2fc37c89..e5234433 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 @@ -93,7 +93,7 @@ public class CommitteeMeetingController extends JeroController pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); + IPage pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req); return Result.OK(pageList); } @@ -181,7 +181,7 @@ public class CommitteeMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); + meeting.setDirectorName(user.getRealname()); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -232,8 +232,8 @@ public class CommitteeMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.COMMITTEE_MEETING_INT); + payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.COMMITTEE_MEETING_INT); return Result.OK("上传资料成功!"); } /** * 发布提醒 */ - @AutoLog(value = "发布提醒",operateType = 2) + @AutoLog(value = "发布提醒", operateType = 2) @RequiresPermissions("committeeMeeting:publish") @ApiOperation(value = "发布提醒", notes = "发布提醒") @PostMapping(value = "/publishReminder") 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 f7e844dd..7f6a6ce1 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 @@ -93,7 +93,7 @@ public class InternalMeetingController extends JeroController pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); + IPage pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req); return Result.OK(pageList); } @@ -181,7 +181,7 @@ public class InternalMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); + meeting.setDirectorName(user.getRealname()); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -232,8 +232,8 @@ public class InternalMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.INTERNATIONAL_MEETING_INT); + payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT); return Result.OK("上传资料成功!"); } 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 1ef11631..08030528 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 @@ -93,7 +93,7 @@ public class OtherMeetingController extends JeroController pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); + IPage pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req); return Result.OK(pageList); } @@ -181,7 +181,7 @@ public class OtherMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); + meeting.setDirectorName(user.getRealname()); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -232,8 +232,8 @@ public class OtherMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.OTHER_MEETING_INT); + payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.OTHER_MEETING_INT); return Result.OK("上传资料成功!"); } 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 2e844561..790c0d03 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 @@ -110,7 +110,7 @@ public class PayMeetingController extends JeroController pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); + IPage pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req); return Result.OK(pageList); } @@ -191,17 +191,17 @@ public class PayMeetingController extends JeroController wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMeetingSituation::getMeetingId,meeting.getId()); - wrapper.eq(PayMeetingSituation::getCompanyContactId,contactId); + wrapper.eq(PayMeetingSituation::getMeetingId, meeting.getId()); + wrapper.eq(PayMeetingSituation::getCompanyContactId, contactId); int count = payMeetingSituationService.count(wrapper); - if (count > 0){ + if (count > 0) { meeting.setMeetingSignUpType(2); - }else { + } else { meeting.setMeetingSignUpType(1); } } @@ -284,7 +284,7 @@ public class PayMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); + meeting.setDirectorName(user.getRealname()); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -334,8 +334,8 @@ public class PayMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.INTERNATIONAL_MEETING_INT); + payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.INTERNATIONAL_MEETING_INT); return Result.OK("上传资料成功!"); } 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 d8f61e6d..c53b140e 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 @@ -93,7 +93,7 @@ public class StandardsMeetingController extends JeroController pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); + IPage pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req); return Result.OK(pageList); } @@ -181,7 +181,7 @@ public class StandardsMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); + meeting.setDirectorName(user.getRealname()); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -232,8 +232,8 @@ public class StandardsMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.STANDARD_MEETING_INT); + payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.STANDARD_MEETING_INT); return Result.OK("上传资料成功!"); } 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 89d414b5..d04c169d 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 @@ -94,7 +94,7 @@ public class WorkGroupMeetingController extends JeroController pageList = payMeetingService.queryPageList(payMeeting,pageNo,pageSize,req); + IPage pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req); return Result.OK(pageList); } @@ -182,7 +182,7 @@ public class WorkGroupMeetingController extends JeroController departNamesByUsername = sysBaseAPI.getDepartNamesByUsername(user.getUsername()); String departName = departNamesByUsername.get(0); - meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); + meeting.setDirectorName(user.getRealname()); meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); PayMeetingVO payMeetingVO = new PayMeetingVO(); BeanUtils.copyProperties(meeting, payMeetingVO); @@ -233,8 +233,8 @@ public class WorkGroupMeetingController extends JeroController uploadFile(@RequestBody UploadFileVO uploadFileVO) { - payMeetingService.uploadFileSendMsg(uploadFileVO,MeetingCommon.WORKING_GROUP_MEETING_INT); + payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.WORKING_GROUP_MEETING_INT); return Result.OK("上传资料成功!"); } 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 03eaa8a9..eac94f08 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 @@ -75,559 +75,562 @@ import org.springframework.transaction.annotation.Transactional; /** * @Description: 会议管理 * @Author: jero-boot - * @Date: 2021-09-02 + * @Date: 2021-09-02 * @Version: V1.0 */ @Service @Transactional(rollbackFor = Exception.class) public class PayMeetingServiceImpl extends ServiceImpl implements IPayMeetingService { - @Resource - private ISysBaseAPI sysBaseAPI; - @Resource - private IPayMeetingHotelContactsService meetingHotelContactsService; - @Resource - private IPayMeetingSituationService payMeetingSituationService; - @Resource - private IPayWorkingGroupService payWorkingGroupService; - @Resource - private IStableCrossTrainingService stableCrossTrainingService; - @Resource - private IPayWorkingGroupSubItemService payWorkingGroupSubItemService; - @Resource - private IPayCompanyManagementService payCompanyManagementService; - @Resource - private IPayContactsManagementService payContactsManagementService; - @Resource - private IPayCaseCommitteeService payCaseCommitteeService; - @Resource - private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService; - @Resource - private IPayMeetingRemindRecordService payMeetingRemindRecordService; - @Resource - private SendMessageService sendMessageService; - @Resource - private IOSSFileService iossFileService; - @Resource - private Environment env; - /** - * 新增会议 - */ - @Override - public void add(PayMeetingVO payMeetingVO) { - //酒店联系人列表 - List hotelContactsList = payMeetingVO.getHotelContactsList(); - //进行校验，赋值操作 - PayMeeting payMeeting = getPayMeeting(payMeetingVO,hotelContactsList); - save(payMeeting); - //如果酒店联系人列表不为空，就新增 - if (!CollectionUtils.isEmpty(hotelContactsList)){ - String meetingId = payMeeting.getId(); - hotelContactsList.forEach(hotelContacts -> - hotelContacts.setMeetingId(meetingId) - ); - meetingHotelContactsService.saveBatch(hotelContactsList); - } - //新增会员系统标协会议 - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { - stableCrossTrainingService.add(payMeeting,hotelContactsList); - } - //工作组会议发送通知 - if (Objects.equals(payMeeting.getMeetingType(),Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))){ - String workingGroupId = payMeeting.getWorkingGroupId(); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId,workingGroupId); - List groupSubItemList = payWorkingGroupSubItemService.list(wrapper); - for (PayWorkingGroupSubItem payWorkingGroupSubItem : groupSubItemList) { - String chargeCompanyId = payWorkingGroupSubItem.getChargeCompanyId(); - //根据企业id查询所有联系人 - List list = payContactsManagementService.list( - new LambdaQueryWrapper() - .eq(PayContactsManagement::getCompanyId, chargeCompanyId) - ); - for (PayContactsManagement payContactsManagement : list) { - sendMessage(payMeeting, payContactsManagement); - } - } - } - } - /** - * 工作组创建会议通知 - * @param payMeeting 会议信息 - * @param payContactsManagement 联系人信息 - * @author lijiarao - * @date 2021/9/24 - */ - private void sendMessage(PayMeeting payMeeting, PayContactsManagement payContactsManagement) { - String phone = payContactsManagement.getPhone(); - String email = payContactsManagement.getEmail(); - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if (!StringUtils.isBlank(email)) { - sendMessageDTO.setEmail(PasswordUtil.decrypt(email)); - } - if (!StringUtils.isBlank(phone)) { - sendMessageDTO.setToUser(PasswordUtil.decrypt(phone)); - sendMessageDTO.setPhone(PasswordUtil.decrypt(phone)); - } - HashMap map = new HashMap<>(); - map.put("meetingName", payMeeting.getMeetingName()); - sendMessageDTO.setFromUser(payMeeting.getDirectorName()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("C_OPEN_TYPE1"); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("id",payMeeting.getId()); - sendMessageDTO.setBusId(jsonObject.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); - } + @Resource + private ISysBaseAPI sysBaseAPI; + @Resource + private IPayMeetingHotelContactsService meetingHotelContactsService; + @Resource + private IPayMeetingSituationService payMeetingSituationService; + @Resource + private IPayWorkingGroupService payWorkingGroupService; + @Resource + private IStableCrossTrainingService stableCrossTrainingService; + @Resource + private IPayWorkingGroupSubItemService payWorkingGroupSubItemService; + @Resource + private IPayCompanyManagementService payCompanyManagementService; + @Resource + private IPayContactsManagementService payContactsManagementService; + @Resource + private IPayCaseCommitteeService payCaseCommitteeService; + @Resource + private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService; + @Resource + private IPayMeetingRemindRecordService payMeetingRemindRecordService; + @Resource + private SendMessageService sendMessageService; + @Resource + private IOSSFileService iossFileService; + @Resource + private Environment env; - @Override - public void addStandards(PayMeeting payMeeting) { - saveOrUpdate(payMeeting); - List hotelContactsList = payMeeting.getHotelContactsList(); - //如果酒店联系人列表不为空，就新增 - if (!CollectionUtils.isEmpty(hotelContactsList)){ - String meetingId = payMeeting.getId(); - //先删除原先的酒店联系人，在添加新的 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayMeetingHotelContacts::getMeetingId,meetingId); - meetingHotelContactsService.remove(queryWrapper); - hotelContactsList.forEach(hotelContacts -> - hotelContacts.setMeetingId(meetingId) - ); - meetingHotelContactsService.saveBatch(hotelContactsList); - } - } + /** + * 新增会议 + */ + @Override + public void add(PayMeetingVO payMeetingVO) { + //酒店联系人列表 + List hotelContactsList = payMeetingVO.getHotelContactsList(); + //进行校验，赋值操作 + PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList); + save(payMeeting); + //如果酒店联系人列表不为空，就新增 + if (!CollectionUtils.isEmpty(hotelContactsList)) { + String meetingId = payMeeting.getId(); + hotelContactsList.forEach(hotelContacts -> + hotelContacts.setMeetingId(meetingId) + ); + meetingHotelContactsService.saveBatch(hotelContactsList); + } + //新增会员系统标协会议 + if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + stableCrossTrainingService.add(payMeeting, hotelContactsList); + } + //工作组会议发送通知 + if (Objects.equals(payMeeting.getMeetingType(), Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) { + String workingGroupId = payMeeting.getWorkingGroupId(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId, workingGroupId); + List groupSubItemList = payWorkingGroupSubItemService.list(wrapper); + for (PayWorkingGroupSubItem payWorkingGroupSubItem : groupSubItemList) { + String chargeCompanyId = payWorkingGroupSubItem.getChargeCompanyId(); + //根据企业id查询所有联系人 + List list = payContactsManagementService.list( + new LambdaQueryWrapper() + .eq(PayContactsManagement::getCompanyId, chargeCompanyId) + ); + for (PayContactsManagement payContactsManagement : list) { + sendMessage(payMeeting, payContactsManagement); + } + } + } + } - /** - * 更新 - */ - @Override + /** + * 工作组创建会议通知 + * + * @param payMeeting 会议信息 + * @param payContactsManagement 联系人信息 + * @author lijiarao + * @date 2021/9/24 + */ + private void sendMessage(PayMeeting payMeeting, PayContactsManagement payContactsManagement) { + String phone = payContactsManagement.getPhone(); + String email = payContactsManagement.getEmail(); + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if (!StringUtils.isBlank(email)) { + sendMessageDTO.setEmail(PasswordUtil.decrypt(email)); + } + if (!StringUtils.isBlank(phone)) { + sendMessageDTO.setToUser(PasswordUtil.decrypt(phone)); + sendMessageDTO.setPhone(PasswordUtil.decrypt(phone)); + } + HashMap map = new HashMap<>(); + map.put("meetingName", payMeeting.getMeetingName()); + sendMessageDTO.setFromUser(payMeeting.getDirectorName()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("C_OPEN_TYPE1"); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("id", payMeeting.getId()); + sendMessageDTO.setBusId(jsonObject.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + } + + @Override + public void addStandards(PayMeeting payMeeting) { + saveOrUpdate(payMeeting); + List hotelContactsList = payMeeting.getHotelContactsList(); + //如果酒店联系人列表不为空，就新增 + if (!CollectionUtils.isEmpty(hotelContactsList)) { + String meetingId = payMeeting.getId(); + //先删除原先的酒店联系人，在添加新的 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayMeetingHotelContacts::getMeetingId, meetingId); + meetingHotelContactsService.remove(queryWrapper); + hotelContactsList.forEach(hotelContacts -> + hotelContacts.setMeetingId(meetingId) + ); + meetingHotelContactsService.saveBatch(hotelContactsList); + } + } + + /** + * 更新 + */ + @Override public void editById(PayMeetingVO payMeetingVO) { - List hotelContactsList = payMeetingVO.getHotelContactsList(); - //进行校验，赋值操作 - PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList); - saveOrUpdate(payMeeting); - //如果酒店联系人列表不为空，就更新 - if (!CollectionUtils.isEmpty(hotelContactsList)){ - String meetingId = payMeeting.getId(); - //先删除原先的酒店联系人，在添加新的 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayMeetingHotelContacts::getMeetingId,meetingId); - meetingHotelContactsService.remove(queryWrapper); - hotelContactsList.forEach(hotelContacts -> - hotelContacts.setMeetingId(meetingId) - ); - meetingHotelContactsService.saveBatch(hotelContactsList); - } - //编辑标协会议 - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { - stableCrossTrainingService.edit(payMeeting,hotelContactsList); - } + List hotelContactsList = payMeetingVO.getHotelContactsList(); + //进行校验，赋值操作 + PayMeeting payMeeting = getPayMeeting(payMeetingVO, hotelContactsList); + saveOrUpdate(payMeeting); + //如果酒店联系人列表不为空，就更新 + if (!CollectionUtils.isEmpty(hotelContactsList)) { + String meetingId = payMeeting.getId(); + //先删除原先的酒店联系人，在添加新的 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayMeetingHotelContacts::getMeetingId, meetingId); + meetingHotelContactsService.remove(queryWrapper); + hotelContactsList.forEach(hotelContacts -> + hotelContacts.setMeetingId(meetingId) + ); + meetingHotelContactsService.saveBatch(hotelContactsList); + } + //编辑标协会议 + if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + stableCrossTrainingService.edit(payMeeting, hotelContactsList); + } } - @NotNull - private PayMeeting getPayMeeting(PayMeetingVO payMeetingVO, List hotelContactsList) { - PayMeeting payMeeting = new PayMeeting(); - //判断会议名称 - String meetingName = payMeetingVO.getMeetingName(); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMeeting::getMeetingName,meetingName); - String id = payMeetingVO.getId(); - if (id !=null){ - wrapper.ne(PayMeeting::getId,id); - } - if (count(wrapper)>0){ - throw new JeroBootException("会议名称不能重复"); - } - //判断会议类型 - String meetingType = payMeetingVO.getMeetingType(); - String type = sysBaseAPI.translateDict("meeting_type", meetingType); - if (StrUtil.isBlank(type)) { - throw new JeroBootException("会议类型不存在"); - }else { - payMeeting.setMeetingType(Integer.valueOf(meetingType)); - } - //判断会议联系人 - String directorId = payMeetingVO.getDirectorId(); - LoginUser loginUser = sysBaseAPI.getUserById(directorId); - if (loginUser == null) { - throw new JeroBootException("会议负责人不存在"); - }else{ - payMeetingVO.setDirectorName(loginUser.getUsername()); - payMeetingVO.setDirectorPhone(loginUser.getPhone()); - } - //如果会议费用为0则不可上传收款二维码 - if (payMeetingVO.getMeetingCosts().compareTo(BigDecimal.ZERO) < 1){ - if (StringUtils.isNotBlank(payMeetingVO.getPaymentQrCode())){ - throw new JeroBootException("会议费用为0时，不可上传收款二维码"); - } - } + @NotNull + private PayMeeting getPayMeeting(PayMeetingVO payMeetingVO, List hotelContactsList) { + PayMeeting payMeeting = new PayMeeting(); + //判断会议名称 + String meetingName = payMeetingVO.getMeetingName(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeeting::getMeetingName, meetingName); + String id = payMeetingVO.getId(); + if (id != null) { + wrapper.ne(PayMeeting::getId, id); + } + if (count(wrapper) > 0) { + throw new JeroBootException("会议名称不能重复"); + } + //判断会议类型 + String meetingType = payMeetingVO.getMeetingType(); + String type = sysBaseAPI.translateDict("meeting_type", meetingType); + if (StrUtil.isBlank(type)) { + throw new JeroBootException("会议类型不存在"); + } else { + payMeeting.setMeetingType(Integer.valueOf(meetingType)); + } + //判断会议联系人 + String directorId = payMeetingVO.getDirectorId(); + LoginUser loginUser = sysBaseAPI.getUserById(directorId); + if (loginUser == null) { + throw new JeroBootException("会议负责人不存在"); + } else { + payMeetingVO.setDirectorName(loginUser.getUsername()); + payMeetingVO.setDirectorPhone(loginUser.getPhone()); + } + //如果会议费用为0则不可上传收款二维码 + if (payMeetingVO.getMeetingCosts().compareTo(BigDecimal.ZERO) < 1) { + if (StringUtils.isNotBlank(payMeetingVO.getPaymentQrCode())) { + throw new JeroBootException("会议费用为0时，不可上传收款二维码"); + } + } - //根据会议类型进行校验 - switch (meetingType) { - case MeetingCommon.WORKING_GROUP_MEETING: - ValidUtil.validate(payMeetingVO, WorkingGroupMeeting.class); - String workingGroupId = payMeetingVO.getWorkingGroupId(); - PayWorkingGroup workingGroup = payWorkingGroupService.getById(workingGroupId); - if (workingGroup == null){ - throw new JeroBootException("工作组项目不存在"); - } - payMeetingVO.setRemind(MeetingCommon.REMIND_0); - break; - case MeetingCommon.STANDARD_MEETING: - ValidUtil.validate(payMeetingVO, StandardMeeting.class); - //标协会议类型 - String tbMeetingType = payMeetingVO.getTbMeetingType(); - String standardMeetingType = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType); - if (standardMeetingType == null){ - throw new JeroBootException("标协会议类型不存在"); - } - payMeeting.setTbMeetingType(Integer.parseInt(tbMeetingType)); - for (PayMeetingHotelContacts hotelContacts : hotelContactsList) { - ValidUtil.validate(hotelContacts, StandardMeeting.class); - } - break; - case MeetingCommon.INTERNATIONAL_MEETING: - ValidUtil.validate(payMeetingVO, InternationalMeeting.class); - //邀请码不能有重复的 - List codeList = new ArrayList<>(); - //VIP邀请码 - String vipInvitationCode = payMeetingVO.getVipInvitationCode(); - codeList.add(vipInvitationCode); - //演讲嘉宾邀请码 - String speakerInvitationCode = payMeetingVO.getSpeakerInvitationCode(); - if (codeList.contains(speakerInvitationCode)) { - throw new JeroBootException("邀请码不能重复"); - } - codeList.add(speakerInvitationCode); - //特邀嘉宾邀请码 - String guestInvitationCode = payMeetingVO.getGuestInvitationCode(); - if (codeList.contains(guestInvitationCode)) { - throw new JeroBootException("邀请码不能重复"); - } - codeList.add(guestInvitationCode); - //合作伙伴邀请码 - String cooperativeInvitationCode = payMeetingVO.getCooperativeInvitationCode(); - if (codeList.contains(cooperativeInvitationCode)) { - throw new JeroBootException("邀请码不能重复"); - } - codeList.add(cooperativeInvitationCode); - break; - case MeetingCommon.COMMITTEE_MEETING: - ValidUtil.validate(payMeetingVO, CaseCommitteeMeeting.class); - String caseCommitteeId = payMeetingVO.getCaseCommitteeId(); - PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(caseCommitteeId); - if (payCaseCommittee == null){ - throw new JeroBootException("分标委项目不存在"); - } - payMeetingVO.setRemind(MeetingCommon.REMIND_0); - break; - default: - } + //根据会议类型进行校验 + switch (meetingType) { + case MeetingCommon.WORKING_GROUP_MEETING: + ValidUtil.validate(payMeetingVO, WorkingGroupMeeting.class); + String workingGroupId = payMeetingVO.getWorkingGroupId(); + PayWorkingGroup workingGroup = payWorkingGroupService.getById(workingGroupId); + if (workingGroup == null) { + throw new JeroBootException("工作组项目不存在"); + } + payMeetingVO.setRemind(MeetingCommon.REMIND_0); + break; + case MeetingCommon.STANDARD_MEETING: + ValidUtil.validate(payMeetingVO, StandardMeeting.class); + //标协会议类型 + String tbMeetingType = payMeetingVO.getTbMeetingType(); + String standardMeetingType = sysBaseAPI.translateDict("standard_meeting_type", tbMeetingType); + if (standardMeetingType == null) { + throw new JeroBootException("标协会议类型不存在"); + } + payMeeting.setTbMeetingType(Integer.parseInt(tbMeetingType)); + for (PayMeetingHotelContacts hotelContacts : hotelContactsList) { + ValidUtil.validate(hotelContacts, StandardMeeting.class); + } + break; + case MeetingCommon.INTERNATIONAL_MEETING: + ValidUtil.validate(payMeetingVO, InternationalMeeting.class); + //邀请码不能有重复的 + List codeList = new ArrayList<>(); + //VIP邀请码 + String vipInvitationCode = payMeetingVO.getVipInvitationCode(); + codeList.add(vipInvitationCode); + //演讲嘉宾邀请码 + String speakerInvitationCode = payMeetingVO.getSpeakerInvitationCode(); + if (codeList.contains(speakerInvitationCode)) { + throw new JeroBootException("邀请码不能重复"); + } + codeList.add(speakerInvitationCode); + //特邀嘉宾邀请码 + String guestInvitationCode = payMeetingVO.getGuestInvitationCode(); + if (codeList.contains(guestInvitationCode)) { + throw new JeroBootException("邀请码不能重复"); + } + codeList.add(guestInvitationCode); + //合作伙伴邀请码 + String cooperativeInvitationCode = payMeetingVO.getCooperativeInvitationCode(); + if (codeList.contains(cooperativeInvitationCode)) { + throw new JeroBootException("邀请码不能重复"); + } + codeList.add(cooperativeInvitationCode); + break; + case MeetingCommon.COMMITTEE_MEETING: + ValidUtil.validate(payMeetingVO, CaseCommitteeMeeting.class); + String caseCommitteeId = payMeetingVO.getCaseCommitteeId(); + PayCaseCommittee payCaseCommittee = payCaseCommitteeService.getById(caseCommitteeId); + if (payCaseCommittee == null) { + throw new JeroBootException("分标委项目不存在"); + } + payMeetingVO.setRemind(MeetingCommon.REMIND_0); + break; + default: + } - BeanUtils.copyProperties(payMeetingVO,payMeeting); - return payMeeting; - } + BeanUtils.copyProperties(payMeetingVO, payMeeting); + return payMeeting; + } - /** - * 通过id删除 - */ - @Override + /** + * 通过id删除 + */ + @Override public void deleteById(String id) { - Integer integer = payMeetingSituationService.countByMeetingId(id); - if (integer>0){ - throw new JeroBootException("该会议有参会人无法删除"); - } - PayMeeting payMeeting = getById(id); - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { - stableCrossTrainingService.delete(id); - } - removeById(id); + Integer integer = payMeetingSituationService.countByMeetingId(id); + if (integer > 0) { + throw new JeroBootException("该会议有参会人无法删除"); + } + PayMeeting payMeeting = getById(id); + if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + stableCrossTrainingService.delete(id); + } + removeById(id); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMeetingHotelContacts::getMeetingId,id); - meetingHotelContactsService.remove(wrapper); + wrapper.eq(PayMeetingHotelContacts::getMeetingId, id); + meetingHotelContactsService.remove(wrapper); } - /** - * 批量删除 - */ - @Override + /** + * 批量删除 + */ + @Override public void deleteByIds(List ids) { - List meetingList = new ArrayList<>(); - for (String id : ids) { - Integer integer = payMeetingSituationService.countByMeetingId(id); - if (integer>0){ - PayMeeting payMeeting = getById(id); - meetingList.add(payMeeting.getMeetingName()); - } - } - if (meetingList.size()>0){ - throw new JeroBootException(meetingList+"会议下有参会人，无法删除"); - } - for (String id : ids) { - PayMeeting payMeeting = getById(id); - if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { - stableCrossTrainingService.delete(id); - } - } + List meetingList = new ArrayList<>(); + for (String id : ids) { + Integer integer = payMeetingSituationService.countByMeetingId(id); + if (integer > 0) { + PayMeeting payMeeting = getById(id); + meetingList.add(payMeeting.getMeetingName()); + } + } + if (meetingList.size() > 0) { + throw new JeroBootException(meetingList + "会议下有参会人，无法删除"); + } + for (String id : ids) { + PayMeeting payMeeting = getById(id); + if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + stableCrossTrainingService.delete(id); + } + } removeByIds(ids); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(PayMeetingHotelContacts::getMeetingId,ids); - meetingHotelContactsService.remove(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(PayMeetingHotelContacts::getMeetingId, ids); + meetingHotelContactsService.remove(wrapper); } - /** - * 通过id查询 - */ - @Override + /** + * 通过id查询 + */ + @Override public PayMeeting queryById(String id) { return getById(id); } /** - * 列表查询 - */ - @Override + * 列表查询 + */ + @Override public List queryList() { return list(); } - @Override - @Transactional - public void publishReminder(PublishReminderVO publishReminderVO) { - List meetingIds = publishReminderVO.getMeetingIds(); - List subitemIds = publishReminderVO.getSubitemIds(); - Integer projectType = publishReminderVO.getProjectType(); + @Override + @Transactional + public void publishReminder(PublishReminderVO publishReminderVO) { + List meetingIds = publishReminderVO.getMeetingIds(); + List subitemIds = publishReminderVO.getSubitemIds(); + Integer projectType = publishReminderVO.getProjectType(); - //用于新增关联关系 - List meetingIdList = new ArrayList<>(); - List subitemIdList = new ArrayList<>(); - List meetingRemindRecordList = new ArrayList<>(); - //组装查询联系人条件 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - List contactsIdList = new ArrayList<>(); - //工作组项目查询公司 - if (Objects.equals(projectType,1)){ - List payWorkingGroupSubItems = payWorkingGroupSubItemService.listByIds(subitemIds); - //把单位会员中所有的联系人取出 - for (PayWorkingGroupSubItem payWorkingGroupSubItem : payWorkingGroupSubItems) { - String groupSubItemId = payWorkingGroupSubItem.getId(); - String contactsIdOne = payWorkingGroupSubItem.getContactsIdOne(); - if (StringUtils.isNotBlank(contactsIdOne)) { - contactsIdList.add(contactsIdOne); - meetingRemindRecordList.add( - new PayMeetingRemindRecord() - .setSubitemId(groupSubItemId) - .setContactId(contactsIdOne) - ); - } - String contactsIdTwo = payWorkingGroupSubItem.getContactsIdTwo(); - if (StringUtils.isNotBlank(contactsIdTwo)) { - contactsIdList.add(contactsIdTwo); - meetingRemindRecordList.add( - new PayMeetingRemindRecord() - .setSubitemId(groupSubItemId) - .setContactId(contactsIdTwo) - ); - } - String contactsIdThree = payWorkingGroupSubItem.getContactsIdThree(); - if (StringUtils.isNotBlank(contactsIdThree)) { - contactsIdList.add(contactsIdThree); - meetingRemindRecordList.add( - new PayMeetingRemindRecord() - .setSubitemId(groupSubItemId) - .setContactId(contactsIdThree) - ); - } - } - // 分标委项目查询人 - }else if (Objects.equals(projectType,2)){ - List payCaseCommitteeSubitems = payCaseCommitteeSubitemService.listByIds(subitemIds); - for (PayCaseCommitteeSubitem payCaseCommitteeSubitem : payCaseCommitteeSubitems) { - String committeeSubitemId = payCaseCommitteeSubitem.getId(); - String contactsId = payCaseCommitteeSubitem.getContactsId(); - contactsIdList.add(contactsId); - meetingRemindRecordList.add( - new PayMeetingRemindRecord() - .setSubitemId(committeeSubitemId) - .setContactId(contactsId) - ); - } - }else { - throw new JeroBootException("项目类型不正确"); - } - wrapper.in(PayContactsManagement::getId,contactsIdList); - List list = payContactsManagementService.list(wrapper); + //用于新增关联关系 + List meetingIdList = new ArrayList<>(); + List subitemIdList = new ArrayList<>(); + List meetingRemindRecordList = new ArrayList<>(); + //组装查询联系人条件 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + List contactsIdList = new ArrayList<>(); + //工作组项目查询公司 + if (Objects.equals(projectType, 1)) { + List payWorkingGroupSubItems = payWorkingGroupSubItemService.listByIds(subitemIds); + //把单位会员中所有的联系人取出 + for (PayWorkingGroupSubItem payWorkingGroupSubItem : payWorkingGroupSubItems) { + String groupSubItemId = payWorkingGroupSubItem.getId(); + String contactsIdOne = payWorkingGroupSubItem.getContactsIdOne(); + if (StringUtils.isNotBlank(contactsIdOne)) { + contactsIdList.add(contactsIdOne); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(groupSubItemId) + .setContactId(contactsIdOne) + ); + } + String contactsIdTwo = payWorkingGroupSubItem.getContactsIdTwo(); + if (StringUtils.isNotBlank(contactsIdTwo)) { + contactsIdList.add(contactsIdTwo); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(groupSubItemId) + .setContactId(contactsIdTwo) + ); + } + String contactsIdThree = payWorkingGroupSubItem.getContactsIdThree(); + if (StringUtils.isNotBlank(contactsIdThree)) { + contactsIdList.add(contactsIdThree); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(groupSubItemId) + .setContactId(contactsIdThree) + ); + } + } + // 分标委项目查询人 + } else if (Objects.equals(projectType, 2)) { + List payCaseCommitteeSubitems = payCaseCommitteeSubitemService.listByIds(subitemIds); + for (PayCaseCommitteeSubitem payCaseCommitteeSubitem : payCaseCommitteeSubitems) { + String committeeSubitemId = payCaseCommitteeSubitem.getId(); + String contactsId = payCaseCommitteeSubitem.getContactsId(); + contactsIdList.add(contactsId); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(committeeSubitemId) + .setContactId(contactsId) + ); + } + } else { + throw new JeroBootException("项目类型不正确"); + } + wrapper.in(PayContactsManagement::getId, contactsIdList); + List list = payContactsManagementService.list(wrapper); - //标记会议为已提醒 - List payMeetings = listByIds(meetingIds); - for (PayMeeting payMeeting : payMeetings) { - String meetingId = payMeeting.getId(); - meetingIdList.add(meetingId); - payMeeting.setRemind(MeetingCommon.REMIND_1); - saveOrUpdate(payMeeting); - //发送消息 - for (PayContactsManagement payContactsManagement : list) { - String directorId = payMeeting.getDirectorId(); - LoginUser director = sysBaseAPI.getUserById(directorId); - // 给企业联系人发送消息 - String email = payContactsManagement.getEmail(); - String phone = payContactsManagement.getPhone(); - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - HashMap map = new HashMap<>(); - if (StringUtils.isNotBlank(payMeeting.getNotice())){ - sendMessageDTO.setMeetingNotice(payMeeting.getNotice()); - } - map.put("meetingName",payMeeting.getMeetingName()); - map.put("busId",meetingId); - sendMessageDTO.setEmail(PasswordUtil.decrypt(email)); - sendMessageDTO.setToUser(PasswordUtil.decrypt(phone)); - sendMessageDTO.setPhone(PasswordUtil.decrypt(phone)); + //标记会议为已提醒 + List payMeetings = listByIds(meetingIds); + for (PayMeeting payMeeting : payMeetings) { + String meetingId = payMeeting.getId(); + meetingIdList.add(meetingId); + payMeeting.setRemind(MeetingCommon.REMIND_1); + saveOrUpdate(payMeeting); + //发送消息 + for (PayContactsManagement payContactsManagement : list) { + String directorId = payMeeting.getDirectorId(); + LoginUser director = sysBaseAPI.getUserById(directorId); + // 给企业联系人发送消息 + String email = payContactsManagement.getEmail(); + String phone = payContactsManagement.getPhone(); + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + HashMap map = new HashMap<>(); + if (StringUtils.isNotBlank(payMeeting.getNotice())) { + sendMessageDTO.setMeetingNotice(payMeeting.getNotice()); + } + map.put("meetingName", payMeeting.getMeetingName()); + map.put("busId", meetingId); + sendMessageDTO.setEmail(PasswordUtil.decrypt(email)); + sendMessageDTO.setToUser(PasswordUtil.decrypt(phone)); + sendMessageDTO.setPhone(PasswordUtil.decrypt(phone)); - sendMessageDTO.setFromUser(director.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setBusType("C_OPEN_TYPE1"); - JSONObject jsonObject = new JSONObject(); - jsonObject.put("id",meetingId); - sendMessageDTO.setBusId(jsonObject.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); + sendMessageDTO.setFromUser(director.getUsername()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("C_OPEN_TYPE1"); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("id", meetingId); + sendMessageDTO.setBusId(jsonObject.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); - } - } - payMeetingRemindRecordService.addList(meetingIdList,meetingRemindRecordList); - } + } + } + payMeetingRemindRecordService.addList(meetingIdList, meetingRemindRecordList); + } @Override public IPage pageListContract(Page page, QueryWrapper queryWrapper, String now) { - return baseMapper.pageListContract(page,queryWrapper,now); + return baseMapper.pageListContract(page, queryWrapper, now); } @Override public IPage queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if(Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)){ - payMeeting.setDirectorId(sysUser.getId()); - } - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); - String meetingStartTime = req.getParameter("meetingStartTime"); - String meetingEndTime = req.getParameter("meetingEndTime"); - if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) { - queryWrapper.not( - a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime) - ); - } else if (ObjectUtil.isNotEmpty(meetingStartTime)) { - queryWrapper.not( - a -> a.lt("end_time", meetingStartTime) - ); - } else if (ObjectUtil.isNotEmpty(meetingEndTime)) { - queryWrapper.not( - a -> a.gt("start_time", meetingEndTime) - ); - } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)) { + payMeeting.setDirectorId(sysUser.getId()); + } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeeting, req.getParameterMap()); + String meetingStartTime = req.getParameter("meetingStartTime"); + String meetingEndTime = req.getParameter("meetingEndTime"); + if (ObjectUtil.isNotEmpty(meetingStartTime) && ObjectUtil.isNotEmpty(meetingEndTime)) { + queryWrapper.not( + a -> a.gt("start_time", meetingEndTime).or().lt("end_time", meetingStartTime) + ); + } else if (ObjectUtil.isNotEmpty(meetingStartTime)) { + queryWrapper.not( + a -> a.lt("end_time", meetingStartTime) + ); + } else if (ObjectUtil.isNotEmpty(meetingEndTime)) { + queryWrapper.not( + a -> a.gt("start_time", meetingEndTime) + ); + } - Page page = new Page<>(pageNo, pageSize); - IPage pageList = page(page, queryWrapper); - for (PayMeeting meeting : pageList.getRecords()) { - //查询会议负责人 - LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); - meeting.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); - meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); - PayMeetingVO payMeetingVO = new PayMeetingVO(); - BeanUtils.copyProperties(payMeetingVO, payMeeting); - //查询酒店联系人列表 - if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId()); - List payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper); - meeting.setHotelContactsList(payMeetingHotelContactsList); - } - } - return pageList; + Page page = new Page<>(pageNo, pageSize); + IPage pageList = page(page, queryWrapper); + for (PayMeeting meeting : pageList.getRecords()) { + //查询会议负责人 + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + meeting.setDirectorName(user.getRealname()); + meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); + PayMeetingVO payMeetingVO = new PayMeetingVO(); + BeanUtils.copyProperties(payMeetingVO, payMeeting); + //查询酒店联系人列表 + if (meeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId()); + List payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper); + meeting.setHotelContactsList(payMeetingHotelContactsList); + } + } + return pageList; } - @Override - @Transactional - public void uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon) { - String id = uploadFileVO.getId(); - PayMeeting payMeeting = getOne( - new LambdaQueryWrapper() - .eq(PayMeeting::getId,id) - .eq(PayMeeting::getMeetingType,meetingCommon) - ); - if (Objects.isNull(payMeeting)){ - throw new JeroBootException("会议不存在"); - } - String fileIds = uploadFileVO.getFileIds(); - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(PayMeeting::getId, id); - wrapper.set(PayMeeting::getMeetingData, fileIds); - update(wrapper); - List meetingFileIdList = Arrays.asList(fileIds.split(",")); - //如果过滤后为空则不发邮件 - if (meetingFileIdList.isEmpty()) { - return; - } - //如果是标协会议就同步文件 - if (meetingCommon.equals(MeetingCommon.STANDARD_MEETING_INT)) { - List 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); - StableCrossTraining stableCrossTraining = new StableCrossTraining(); - stableCrossTraining.setId(id); - stableCrossTraining.setMeetingFiles(fileIds); - AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/updateStandardsFile", null, stableCrossTraining); - } - //发送邮件 - List ossFiles = iossFileService.listByIds(meetingFileIdList); - String path = env.getProperty("jero.path.upload") + File.separator; - //获取文件路径 - List listFile = new ArrayList<>(); - for (OSSFile ossFile : ossFiles) { - String url = ossFile.getUrl(); - listFile.add(path + url); - } - //获得审核通过的参会人 - List payMeetingSituations = payMeetingSituationService.list( - new LambdaQueryWrapper() - .select(PayMeetingSituation::getCompanyContactId) - .eq(PayMeetingSituation::getMeetingId, id) - .eq(PayMeetingSituation::getCheckResult, MeetingSubitemCommon.SIGNUP_STATUS_1) - ); - if (payMeetingSituations.isEmpty()) { - return; - } - //当前登录人 - LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //获得参会人 - List companyContactIdList = payMeetingSituations.stream().map(PayMeetingSituation::getCompanyContactId).collect(Collectors.toList()); - for (String contactId : companyContactIdList) { - PayContactsManagement payContactsManagement = payContactsManagementService.getById(contactId); - // 发送消息 - SendMessageDTO sendMessageDTO = new SendMessageDTO(); - if(!StringUtils.isBlank(payContactsManagement.getEmail())){ - sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); - } - if(!StringUtils.isEmpty(payContactsManagement.getPhone())){ - sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone())); - sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); - } - HashMap map = new HashMap<>(); - map.put("meetingName", payMeeting.getMeetingName()); - sendMessageDTO.setFromUser(loginUser.getUsername()); - sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG7.getCode()); - sendMessageDTO.setTemplateParam(map); - sendMessageDTO.setListFile(listFile); - sendMessageDTO.setBusType("C_OPEN_TYPE7"); - JSONObject json = new JSONObject(); - json.put("id",payMeeting.getId()); - sendMessageDTO.setBusId(json.toJSONString()); - sendMessageService.SendMessageService(sendMessageDTO); - } - } + @Override + @Transactional + public void uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon) { + String id = uploadFileVO.getId(); + PayMeeting payMeeting = getOne( + new LambdaQueryWrapper() + .eq(PayMeeting::getId, id) + .eq(PayMeeting::getMeetingType, meetingCommon) + ); + if (Objects.isNull(payMeeting)) { + throw new JeroBootException("会议不存在"); + } + String fileIds = uploadFileVO.getFileIds(); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(PayMeeting::getId, id); + wrapper.set(PayMeeting::getMeetingData, fileIds); + update(wrapper); + List meetingFileIdList = Arrays.asList(fileIds.split(",")); + //如果过滤后为空则不发邮件 + if (meetingFileIdList.isEmpty()) { + return; + } + //如果是标协会议就同步文件 + if (meetingCommon.equals(MeetingCommon.STANDARD_MEETING_INT)) { + List 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); + StableCrossTraining stableCrossTraining = new StableCrossTraining(); + stableCrossTraining.setId(id); + stableCrossTraining.setMeetingFiles(fileIds); + AuthenticationUtils.post("/stablecrosstraining/stableCrossTraining/updateStandardsFile", null, stableCrossTraining); + } + //发送邮件 + List ossFiles = iossFileService.listByIds(meetingFileIdList); + String path = env.getProperty("jero.path.upload") + File.separator; + //获取文件路径 + List listFile = new ArrayList<>(); + for (OSSFile ossFile : ossFiles) { + String url = ossFile.getUrl(); + listFile.add(path + url); + } + //获得审核通过的参会人 + List payMeetingSituations = payMeetingSituationService.list( + new LambdaQueryWrapper() + .select(PayMeetingSituation::getCompanyContactId) + .eq(PayMeetingSituation::getMeetingId, id) + .eq(PayMeetingSituation::getCheckResult, MeetingSubitemCommon.SIGNUP_STATUS_1) + ); + if (payMeetingSituations.isEmpty()) { + return; + } + //当前登录人 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //获得参会人 + List companyContactIdList = payMeetingSituations.stream().map(PayMeetingSituation::getCompanyContactId).collect(Collectors.toList()); + for (String contactId : companyContactIdList) { + PayContactsManagement payContactsManagement = payContactsManagementService.getById(contactId); + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + if (!StringUtils.isBlank(payContactsManagement.getEmail())) { + sendMessageDTO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); + } + if (!StringUtils.isEmpty(payContactsManagement.getPhone())) { + sendMessageDTO.setToUser(PasswordUtil.decrypt(payContactsManagement.getPhone())); + sendMessageDTO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); + } + HashMap map = new HashMap<>(); + map.put("meetingName", payMeeting.getMeetingName()); + sendMessageDTO.setFromUser(loginUser.getUsername()); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG7.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setListFile(listFile); + sendMessageDTO.setBusType("C_OPEN_TYPE7"); + JSONObject json = new JSONObject(); + json.put("id", payMeeting.getId()); + sendMessageDTO.setBusId(json.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + } + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java index c64153e4..ec11686b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java @@ -45,216 +45,216 @@ import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; - /** +/** * @Description: 会员项目表 * @Author: jero-boot - * @Date: 2021-08-26 + * @Date: 2021-08-26 * @Version: V1.0 */ -@Api(tags="会员项目表") +@Api(tags = "会员项目表") @RestController @RequestMapping("/jero/memberProject") @Slf4j public class PayMemberProjectController extends JeroController { - @Resource - private IPayMemberProjectService memberProjectService; - @Resource - private IPayIncomeContractService payIncomeContractService; - @Resource - private ITbMemberProjectSubitemService tbMemberProjectSubitemService; - @Resource - private IPayMemberProjectSubitemService memberProjectSubitemService; - @Resource - private ISysBaseAPI sysBaseAPI; + @Resource + private IPayMemberProjectService memberProjectService; + @Resource + private IPayIncomeContractService payIncomeContractService; + @Resource + private ITbMemberProjectSubitemService tbMemberProjectSubitemService; + @Resource + private IPayMemberProjectSubitemService memberProjectSubitemService; + @Resource + private ISysBaseAPI sysBaseAPI; - - /** - * 分页列表查询 - */ - @RequiresPermissions("memberProject:search") - @ApiOperation(value="会员项目表-根据成员单位列表查询", notes="会员项目表-根据成员单位列表查询") - @GetMapping(value = "/page") - public Result queryPageList(PayMemberProject payMemberProject, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if(Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)){ - payMemberProject.setDirectorId(sysUser.getId()); - } - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage memberProjectPage = memberProjectService.getPage(page, queryWrapper); - for (PayMemberProject memberProject : memberProjectPage.getRecords()) { - LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId()); - memberProject.setDirectorName(user.getRealname() + "(" + user.getDepartNames() + ")"); - } - return Result.OK(memberProjectPage); - } - - /** - * @Description 收入合同列表分页查询 - * @Author lqt - * @Date 2021/9/17 - * @Param companyId 企业id - * @Param contractId 合同id - * @Param projectType 会员类型 4：会员项目，5：标协会员项目 - * @Param memberName 会员名称 - * @Return - * @Exception - */ - @RequiresPermissions("memberProject:search") - @ApiOperation(value="会员项目表-收入合同列表分页查询", notes="会员项目表-收入合同列表分页查询") - @GetMapping(value = "/queryListByCompany") - public Result queryListByCompany( - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - @RequestParam(name = "companyId") String companyId, - @RequestParam(name = "contractId") String contractId, - @RequestParam(name = "projectType") String projectType, - @RequestParam(name = "projectName",required = false) String projectName, - @RequestParam(name = "memberName", required = false) String memberName) { - - if(StringUtils.isBlank(companyId)){ - return Result.error("企业id不能为空！"); - } - PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId); - if(Objects.isNull(payIncomeContract)){ - return Result.error("合同不存在！"); - } - // 会员 - if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE4)){ - Page page = new Page<>(pageNo, pageSize); - projectName = oConvertUtils.replaceAllPercent(projectName); - IPage list = memberProjectService.queryListByCompany(page,companyId,projectName,PayProjectCommon.PROJECT_TYPE4,payIncomeContract.getPack(),payIncomeContract.getPackYear()); - return Result.OK(list); - } - // 标协会员 - if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE5)){ - Page page = new Page<>(pageNo, pageSize); - IPage list = tbMemberProjectSubitemService.queryListByCompany(page,companyId,PayProjectCommon.PROJECT_TYPE4,payIncomeContract.getPack(),payIncomeContract.getPackYear()); - if(!CollectionUtils.isEmpty(list.getRecords())){ - List listTbMemberProjectSubitem = list.getRecords(); - listTbMemberProjectSubitem.forEach(p->{ - if(!StringUtils.isBlank(p.getEmail())){ - p.setEmail(PasswordUtil.decrypt(p.getEmail())); - } - if(!StringUtils.isBlank(p.getMobile())){ - p.setMobile(PasswordUtil.decrypt(p.getMobile())); - } - }); - list.setRecords(listTbMemberProjectSubitem); - } - return Result.OK(list); - } - return Result.OK(null); - } - - /** - * 收入合同-查询非企业id的项目 - */ - @RequiresPermissions("memberProject:search") - @ApiOperation(value="会员项目表-收入合同-查询非企业id的项目", notes="会员项目表-收入合同-查询非企业id的项目") - @GetMapping(value = "/queryListByNotCompany") - public Result queryListByNotCompany(@RequestParam(name = "companyId") String companyId) { - if(StringUtils.isBlank(companyId)){ - return Result.error("企业id不能为空！"); - } - LambdaQueryWrapper queryPayMemberProjectSubitem = new LambdaQueryWrapper<>(); - queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId,companyId); - List listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem); - List list; - if(!CollectionUtils.isEmpty(listPayMemberProjectSubitem)){ - List listId = listPayMemberProjectSubitem.stream().map(PayMemberProjectSubitem::getProjectId).collect(Collectors.toList()); - LambdaQueryWrapper queryPayMemberProject = new LambdaQueryWrapper<>(); - queryPayMemberProject.notIn(PayMemberProject::getId,listId); - list = memberProjectService.list(queryPayMemberProject); - }else{ - list = memberProjectService.list(); - } - return Result.OK(list); - } /** - * 列表查询 - */ - @RequiresPermissions("memberProject:search") - @ApiOperation(value="会员项目表-列表查询", notes="会员项目表-列表查询") - @GetMapping(value = "/list") - public Result> queryList() { + * 分页列表查询 + */ + @RequiresPermissions("memberProject:search") + @ApiOperation(value = "会员项目表-根据成员单位列表查询", notes = "会员项目表-根据成员单位列表查询") + @GetMapping(value = "/page") + public Result queryPageList(PayMemberProject payMemberProject, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (Objects.equals(sysUser.getRoleCode(), RoleCommon.XMFZR)) { + payMemberProject.setDirectorId(sysUser.getId()); + } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage memberProjectPage = memberProjectService.getPage(page, queryWrapper); + for (PayMemberProject memberProject : memberProjectPage.getRecords()) { + LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId()); + memberProject.setDirectorName(user.getRealname()); + } + return Result.OK(memberProjectPage); + } + + /** + * @Description 收入合同列表分页查询 + * @Author lqt + * @Date 2021/9/17 + * @Param companyId 企业id + * @Param contractId 合同id + * @Param projectType 会员类型 4：会员项目，5：标协会员项目 + * @Param memberName 会员名称 + * @Return + * @Exception + */ + @RequiresPermissions("memberProject:search") + @ApiOperation(value = "会员项目表-收入合同列表分页查询", notes = "会员项目表-收入合同列表分页查询") + @GetMapping(value = "/queryListByCompany") + public Result queryListByCompany( + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "companyId") String companyId, + @RequestParam(name = "contractId") String contractId, + @RequestParam(name = "projectType") String projectType, + @RequestParam(name = "projectName", required = false) String projectName, + @RequestParam(name = "memberName", required = false) String memberName) { + + if (StringUtils.isBlank(companyId)) { + return Result.error("企业id不能为空！"); + } + PayIncomeContract payIncomeContract = payIncomeContractService.getById(contractId); + if (Objects.isNull(payIncomeContract)) { + return Result.error("合同不存在！"); + } + // 会员 + if (Objects.equals(projectType, PayProjectCommon.PROJECT_TYPE4)) { + Page page = new Page<>(pageNo, pageSize); + projectName = oConvertUtils.replaceAllPercent(projectName); + IPage list = memberProjectService.queryListByCompany(page, companyId, projectName, PayProjectCommon.PROJECT_TYPE4, payIncomeContract.getPack(), payIncomeContract.getPackYear()); + return Result.OK(list); + } + // 标协会员 + if (Objects.equals(projectType, PayProjectCommon.PROJECT_TYPE5)) { + Page page = new Page<>(pageNo, pageSize); + IPage list = tbMemberProjectSubitemService.queryListByCompany(page, companyId, PayProjectCommon.PROJECT_TYPE4, payIncomeContract.getPack(), payIncomeContract.getPackYear()); + if (!CollectionUtils.isEmpty(list.getRecords())) { + List listTbMemberProjectSubitem = list.getRecords(); + listTbMemberProjectSubitem.forEach(p -> { + if (!StringUtils.isBlank(p.getEmail())) { + p.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + if (!StringUtils.isBlank(p.getMobile())) { + p.setMobile(PasswordUtil.decrypt(p.getMobile())); + } + }); + list.setRecords(listTbMemberProjectSubitem); + } + return Result.OK(list); + } + return Result.OK(null); + } + + /** + * 收入合同-查询非企业id的项目 + */ + @RequiresPermissions("memberProject:search") + @ApiOperation(value = "会员项目表-收入合同-查询非企业id的项目", notes = "会员项目表-收入合同-查询非企业id的项目") + @GetMapping(value = "/queryListByNotCompany") + public Result queryListByNotCompany(@RequestParam(name = "companyId") String companyId) { + if (StringUtils.isBlank(companyId)) { + return Result.error("企业id不能为空！"); + } + LambdaQueryWrapper queryPayMemberProjectSubitem = new LambdaQueryWrapper<>(); + queryPayMemberProjectSubitem.eq(PayMemberProjectSubitem::getCompanyId, companyId); + List listPayMemberProjectSubitem = memberProjectSubitemService.list(queryPayMemberProjectSubitem); + List list; + if (!CollectionUtils.isEmpty(listPayMemberProjectSubitem)) { + List listId = listPayMemberProjectSubitem.stream().map(PayMemberProjectSubitem::getProjectId).collect(Collectors.toList()); + LambdaQueryWrapper queryPayMemberProject = new LambdaQueryWrapper<>(); + queryPayMemberProject.notIn(PayMemberProject::getId, listId); + list = memberProjectService.list(queryPayMemberProject); + } else { + list = memberProjectService.list(); + } + return Result.OK(list); + } + + /** + * 列表查询 + */ + @RequiresPermissions("memberProject:search") + @ApiOperation(value = "会员项目表-列表查询", notes = "会员项目表-列表查询") + @GetMapping(value = "/list") + public Result> queryList() { List list = memberProjectService.queryList(); return Result.OK(list); - } - - /** - * 添加 - */ - @RequiresPermissions("memberProject:add") - @AutoLog(value = "会员项目表-添加") - @ApiOperation(value="会员项目表-添加", notes="会员项目表-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody PayMemberProject payMemberProject) { - memberProjectService.add(payMemberProject); - return Result.OK("添加成功！"); - } - - /** - * 编辑 - */ - @RequiresPermissions("memberProject:edit") - @AutoLog(value = "会员项目表-编辑") - @ApiOperation(value="会员项目表-编辑", notes="会员项目表-编辑") - @PostMapping(value = "/edit") - public Result edit(@Validated @RequestBody PayMemberProject payMemberProject) { - memberProjectService.editById(payMemberProject); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - */ - @RequiresPermissions("memberProject:delete") - @AutoLog(value = "会员项目表-通过id删除") - @ApiOperation(value="会员项目表-通过id删除", notes="会员项目表-通过id删除") - @GetMapping(value = "/delete") - public Result delete(@RequestParam(name="id") String id) { - memberProjectService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - */ - @RequiresPermissions("memberProject:batchDel") - @AutoLog(value = "会员项目表-批量删除") - @ApiOperation(value="会员项目表-批量删除", notes="会员项目表-批量删除") - @GetMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids") String ids) { - this.memberProjectService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - */ - @RequiresPermissions("memberProject:search") - @ApiOperation(value="会员项目表-通过id查询", notes="会员项目表-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id") String id) { - PayMemberProject payMemberProject = memberProjectService.queryById(id); - if(payMemberProject ==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(payMemberProject); - } + } /** - * 导出excel - */ - @RequiresPermissions("memberProject:export") + * 添加 + */ + @RequiresPermissions("memberProject:add") + @AutoLog(value = "会员项目表-添加") + @ApiOperation(value = "会员项目表-添加", notes = "会员项目表-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody PayMemberProject payMemberProject) { + memberProjectService.add(payMemberProject); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + */ + @RequiresPermissions("memberProject:edit") + @AutoLog(value = "会员项目表-编辑") + @ApiOperation(value = "会员项目表-编辑", notes = "会员项目表-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody PayMemberProject payMemberProject) { + memberProjectService.editById(payMemberProject); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + */ + @RequiresPermissions("memberProject:delete") + @AutoLog(value = "会员项目表-通过id删除") + @ApiOperation(value = "会员项目表-通过id删除", notes = "会员项目表-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name = "id") String id) { + memberProjectService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + */ + @RequiresPermissions("memberProject:batchDel") + @AutoLog(value = "会员项目表-批量删除") + @ApiOperation(value = "会员项目表-批量删除", notes = "会员项目表-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids") String ids) { + this.memberProjectService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + */ + @RequiresPermissions("memberProject:search") + @ApiOperation(value = "会员项目表-通过id查询", notes = "会员项目表-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id") String id) { + PayMemberProject payMemberProject = memberProjectService.queryById(id); + if (payMemberProject == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payMemberProject); + } + + /** + * 导出excel + */ + @RequiresPermissions("memberProject:export") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, PayMemberProject payMemberProject) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, request.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMemberProject, request.getParameterMap()); List pageList = memberProjectService.list(queryWrapper); // 过滤选中数据 String selections = request.getParameter("selections"); @@ -265,16 +265,16 @@ public class PayMemberProjectController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, PayMemberProject.class); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java index 951ec8d7..d85d691f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java @@ -78,18 +78,18 @@ public class PayMemberProjectSubitemController extends JeroController> queryPageListCompany(PayMemberProjectSubitem payMemberProjectSubitem, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = loginUser.getId(); PayContactsManagement contactsManagement = contactsManagementService.getById(userId); payMemberProjectSubitem.setCompanyId(contactsManagement.getCompanyId()); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap()); - if (StringUtils.isNotBlank(payMemberProjectSubitem.getParticularYear())){ - queryWrapper.eq("pmp.particular_year",payMemberProjectSubitem.getParticularYear()); + if (StringUtils.isNotBlank(payMemberProjectSubitem.getParticularYear())) { + queryWrapper.eq("pmp.particular_year", payMemberProjectSubitem.getParticularYear()); } - if (StringUtils.isNotBlank(payMemberProjectSubitem.getProjectName())){ + if (StringUtils.isNotBlank(payMemberProjectSubitem.getProjectName())) { queryWrapper.like("pmp.project_name", oConvertUtils.replaceAllPercent(payMemberProjectSubitem.getProjectName().trim())); } Page page = new Page<>(pageNo, pageSize); @@ -97,8 +97,8 @@ public class PayMemberProjectSubitemController extends JeroController