LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 通过会议id和参会人id查询企业信息和所有联系人信息

Browse Source
This commit is contained in:
lijiarao
2024-09-11 09:54:55 +08:00
parent ab687e9012
commit 2c0e8eaa0b
13 changed files with 77 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java
+1
View File
@@ -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");//数据字典
jero-boot-incoming-payment/src/main/java/com/jero/company/vo/CompanyInfoVO.java
+22
View File
@@ -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<PayContactsManagement> contactsManagementList;
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java
+1 -13
View File
@@ -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<PayMeeti
@ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
@GetMapping(value = "/queryByMeetingId")
public Result<?> queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) {
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId);
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId);
if (payMeetingSituation == null) {
return Result.error("未找到对应数据");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CouncilMeetingSituationController.java
+1 -1
View File
@@ -166,7 +166,7 @@ public class CouncilMeetingSituationController extends JeroController<PayMeeting
@ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
@GetMapping(value = "/queryByMeetingId")
public Result<?> queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) {
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId);
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId);
if (payMeetingSituation == null) {
return Result.error("未找到对应数据");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java
+14 -6
View File
@@ -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<PayMeet
// @DictPoint
@ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
@GetMapping(value = "/queryByMeetingId")
public Result<?> queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) {
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId);
public Result<PayMeetingSituation> 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<CompanyInfoVO> queryInfoByMeetingIdAndContactId(@RequestParam(name = "meetingId") String meetingId,
@RequestParam(name = "contactId") String contactId) {
CompanyInfoVO companyInfoVO = payMeetingSituationService.queryInfoByMeetingIdAndContactId(meetingId,contactId);
return Result.OK(companyInfoVO);
}
/**
* 审核报名信息
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingSituationController.java
+1 -1
View File
@@ -162,7 +162,7 @@ public class InternalMeetingSituationController extends JeroController<PayMeetin
@ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
@GetMapping(value = "/queryByMeetingId")
public Result<?> queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) {
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId);
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId);
if (payMeetingSituation == null) {
return Result.error("未找到对应数据");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java
+1 -1
View File
@@ -161,7 +161,7 @@ public class OtherMeetingSituationController extends JeroController<PayMeetingSi
@ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
@GetMapping(value = "/queryByMeetingId")
public Result<?> queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) {
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId);
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId);
if (payMeetingSituation == null) {
return Result.error("未找到对应数据");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+1 -4
View File
@@ -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<PayMeetingSitu
@ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
@GetMapping(value = "/queryByMeetingId")
public Result<?> queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) {
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId);
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId);
if (payMeetingSituation == null) {
return Result.error("未找到对应数据");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java
+1 -1
View File
@@ -164,7 +164,7 @@ public class SafetyCenterMeetingSituationController extends JeroController<PayMe
@ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
@GetMapping(value = "/queryByMeetingId")
public Result<?> queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) {
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId);
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId);
if (payMeetingSituation == null) {
return Result.error("未找到对应数据");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java
+1 -1
View File
@@ -188,7 +188,7 @@ public class StandardsMeetingSituationController extends JeroController<PayMeeti
@ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
@GetMapping(value = "/queryByMeetingId")
public Result<?> queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) {
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId);
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId);
if (payMeetingSituation == null) {
return Result.error("未找到对应数据");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java
+1 -1
View File
@@ -170,7 +170,7 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
@ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息")
@GetMapping(value = "/queryByMeetingId")
public Result<?> queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) {
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId);
PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingId(meetingId);
if (payMeetingSituation == null) {
return Result.error("未找到对应数据");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
+5 -1
View File
@@ -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<PayMeetingSituatio
/**
* 通过会议id查询自己的参会人信息
*/
PayMeetingSituation queryByMeetingIdAndContactId(String meetingId);
PayMeetingSituation queryByMeetingId(String meetingId);
CompanyInfoVO queryInfoByMeetingIdAndContactId(String meetingId, String contactId);
void editTerminal(PayMeetingSituationVO payMeetingSituationVO);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+27 -1
View File
@@ -35,6 +35,7 @@ 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.company.vo.CompanyInfoVO;
import com.jero.company.vo.UpdateInvoicePram;
import com.jero.config.StaticConfig;
import com.jero.contract.common.PayIncomeContractCommon;
@@ -916,7 +917,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
@Override
public PayMeetingSituation queryByMeetingIdAndContactId(String meetingId) {
public PayMeetingSituation queryByMeetingId(String meetingId) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
@@ -925,6 +926,31 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
return getOne(wrapper);
}
@Override
public CompanyInfoVO queryInfoByMeetingIdAndContactId(String meetingId, String contactId) {
LambdaQueryWrapper<PayMeetingSituation> 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<PayMeetingSituation> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(PayMeetingSituation::getMeetingId, meetingId);
wrapper1.eq(PayMeetingSituation::getCompanyId, companyId);
List<PayMeetingSituation> meetingSituationList = this.list(wrapper1);
List<String> contactIdList = meetingSituationList.stream().map(PayMeetingSituation::getCompanyContactId).collect(Collectors.toList());
List<PayContactsManagement> contactsManagementList = contactsManagementService.listByIds(contactIdList);
companyInfoVO.setContactsManagementList(contactsManagementList);
return companyInfoVO;
}
@Override
public void editTerminal(PayMeetingSituationVO payMeetingSituationVO) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();