diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index fa146dbb..44a0100d 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -131,6 +131,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/meeting/payMeetingSituation/signUp","anon");//报名 filterChainDefinitionMap.put("/meeting/overseasSituation/signUp","anon");//海外会议报名 filterChainDefinitionMap.put("/meeting/payMeetingSituation/validInvitationCode","anon");//报名 + filterChainDefinitionMap.put("/meeting/draftGroupMeetingSituation/queryInfoByMeetingIdAndContactId","anon");//通过会议id和参会人id查询企业信息和所有联系人信息 filterChainDefinitionMap.put("/meeting/payMeeting/queryById","anon");//会议详情 filterChainDefinitionMap.put("/sys/common/upload","anon");//上传文件 filterChainDefinitionMap.put("/sys/dict/getDictItems/**","anon");//数据字典 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyInfoVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyInfoVO.java new file mode 100644 index 00000000..4960b750 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyInfoVO.java @@ -0,0 +1,22 @@ +package com.jero.company.vo; + +import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.entity.PayContactsManagement; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * 企业端登录 + * @author liJiaRao + * @date 2021-09-23 14:59 + */ +@Data +public class CompanyInfoVO { + @ApiModelProperty(value = "企业信息") + private PayCompanyManagement companyManagement; + + @ApiModelProperty(value = "企业联系人信息") + private List contactsManagementList; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java index f596fe99..8012c6c0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java @@ -11,40 +11,28 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.service.RolePermissionService; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.AuthenticationUtils; -import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; -import com.jero.common.util.oConvertUtils; -import com.jero.company.entity.PayCompanyManagement; -import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.meeting.common.MeetingCommon; -import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingService; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.*; -import com.jero.meeting.vo.excel.*; import com.jero.project.common.PayProjectCommon; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; /** @@ -179,7 +167,7 @@ public class CommitteeMeetingSituationController extends JeroController queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { - PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId); if (payMeetingSituation == null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java index 2da291b2..2542546e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java @@ -166,7 +166,7 @@ public class CouncilMeetingSituationController extends JeroController queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { - PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId); if (payMeetingSituation == null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java index 324f52b7..7db06547 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java @@ -14,20 +14,18 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; +import com.jero.company.vo.CompanyInfoVO; import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.drafting.service.IPayDraftingGroupService; import com.jero.drafting.service.IPayDraftingGroupSubItemService; import com.jero.meeting.common.MeetingCommon; -import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.meeting.vo.CheckVO; import com.jero.meeting.vo.PayMeetingSituationVO; import com.jero.meeting.vo.SetGuestsUploadFileVO; import com.jero.project.common.PayProjectCommon; -import com.jero.project.entity.PayWorkingGroup; -import com.jero.project.entity.PayWorkingGroupSubItem; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -175,13 +173,23 @@ public class DraftGroupMeetingSituationController extends JeroController queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { - PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + public Result queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId); if (payMeetingSituation == null) { - return Result.error("未找到对应数据"); + throw new JeroBootException("未找到对应数据"); } return Result.OK(payMeetingSituation); } + /** + * 通过会议id查询自己的参会人信息 + */ + @ApiOperation(value = "通过会议id和参会人id查询企业信息和所有联系人信息") + @GetMapping(value = "/queryInfoByMeetingIdAndContactId") + public Result queryInfoByMeetingIdAndContactId(@RequestParam(name = "meetingId") String meetingId, + @RequestParam(name = "contactId") String contactId) { + CompanyInfoVO companyInfoVO = payMeetingSituationService.queryInfoByMeetingIdAndContactId(meetingId,contactId); + return Result.OK(companyInfoVO); + } /** * 审核报名信息 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java index 400e78de..699bbb20 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java @@ -162,7 +162,7 @@ public class InternalMeetingSituationController extends JeroController queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { - PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId); if (payMeetingSituation == null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java index c92c2c3c..9fa0da4d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java @@ -161,7 +161,7 @@ public class OtherMeetingSituationController extends JeroController queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { - PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId); if (payMeetingSituation == null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java index a926926a..1fdf4085 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java @@ -46,9 +46,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.jero.common.aspect.annotation.AutoLog; -import static org.jeecg.modules.jmreport.desreport.b.b.i; -import static org.jeecg.modules.jmreport.desreport.b.b.m; - /** * @description: 参会人员信息 @@ -242,7 +239,7 @@ public class PayMeetingSituationController extends JeroController queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { - PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId); if (payMeetingSituation == null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java index 4c95bcb0..2a286556 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java @@ -164,7 +164,7 @@ public class SafetyCenterMeetingSituationController extends JeroController queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { - PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId); if (payMeetingSituation == null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java index 0e75f673..bf9558cf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java @@ -188,7 +188,7 @@ public class StandardsMeetingSituationController extends JeroController queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { - PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId); if (payMeetingSituation == null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java index a486d374..92d01069 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java @@ -170,7 +170,7 @@ public class WorkGroupMeetingSituationController extends JeroController queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { - PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId); if (payMeetingSituation == null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java index cb9895e5..e34bb6e6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.common.api.vo.Result; +import com.jero.company.vo.CompanyInfoVO; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingGuestsFile; import com.jero.meeting.entity.PayMeetingSituation; @@ -81,7 +82,10 @@ public interface IPayMeetingSituationService extends IService wrapper = new LambdaQueryWrapper<>(); @@ -925,6 +926,31 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingSituation::getMeetingId, meetingId); + wrapper.eq(PayMeetingSituation::getCompanyContactId, contactId); + PayMeetingSituation one = this.getOne(wrapper); + if (one == null){ + return null; + } + CompanyInfoVO companyInfoVO = new CompanyInfoVO(); + //查询企业信息 + String companyId = one.getCompanyId(); + PayCompanyManagement companyManagement = companyManagementService.getById(companyId); + companyInfoVO.setCompanyManagement(companyManagement); + //查询联系人信息 + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(PayMeetingSituation::getMeetingId, meetingId); + wrapper1.eq(PayMeetingSituation::getCompanyId, companyId); + List meetingSituationList = this.list(wrapper1); + List contactIdList = meetingSituationList.stream().map(PayMeetingSituation::getCompanyContactId).collect(Collectors.toList()); + List contactsManagementList = contactsManagementService.listByIds(contactIdList); + companyInfoVO.setContactsManagementList(contactsManagementList); + return companyInfoVO; + } + @Override public void editTerminal(PayMeetingSituationVO payMeetingSituationVO) { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();