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

This commit is contained in:
lijiarao
2024-09-11 13:57:36 +08:00
parent 4ab9ef578d
commit 988072e4a8
4 changed files with 44 additions and 1 deletions
@@ -143,6 +143,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/meeting/internalMeeting/getLinkTopics","anon");//查询关联会议
filterChainDefinitionMap.put("/pack/payPackCompany/judgeCompanyIsPackaged","anon");//判断当前企业是否是打包企业
filterChainDefinitionMap.put("/company/payCompanyManagement/judgeCompanyIsPackaged","anon");//判断当前企业是否是打包企业
filterChainDefinitionMap.put("/drafting/payDraftingGroupSubitem/queryInfoByDraftIdAndContactId","anon");//通过起草组id和参会人id查询企业信息和所有联系人信息
//通过单位名称查询该单位是否可用
filterChainDefinitionMap.put("/member/tbMemberProjectSubitem/enableMemberByCompanyName", "anon");
//门户端-分页查询所有会员名称
@@ -12,6 +12,7 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.ValidUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.company.vo.CompanyInfoVO;
import com.jero.drafting.common.DraftingConstant;
import com.jero.drafting.entity.PayDraftingGroup;
import com.jero.drafting.entity.PayDraftingGroupSubItem;
@@ -635,4 +636,15 @@ public class PayDraftingGroupSubItemController extends JeroController<PayDraftin
payDraftingGroupSubItemService.addPayDraftingGroupSubItem(payDraftingGroupSubItem);
return Result.OK("添加成功!");
}
/**
* 通过起草组id和参会人id查询企业信息和所有联系人信息
*/
@ApiOperation(value = "通过起草组id和参会人id查询企业信息和所有联系人信息")
@GetMapping(value = "/queryInfoByDraftIdAndContactId")
public Result<CompanyInfoVO> queryInfoByDraftIdAndContactId(@RequestParam(name = "draftId") String draftId,
@RequestParam(name = "contactId") String contactId) {
CompanyInfoVO companyInfoVO = payDraftingGroupSubItemService.queryInfoByDraftIdAndContactId(draftId,contactId);
return Result.OK(companyInfoVO);
}
}
@@ -3,6 +3,7 @@ package com.jero.drafting.service;
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.company.vo.CompanyInfoVO;
import com.jero.drafting.entity.PayDraftingGroupSubItem;
import com.jero.drafting.vo.CheckVo;
@@ -34,6 +35,8 @@ public interface IPayDraftingGroupSubItemService extends IService<PayDraftingGro
*/
void addPayDraftingGroupSubItem(PayDraftingGroupSubItem payDraftingGroupSubItem);
CompanyInfoVO queryInfoByDraftIdAndContactId(String draftId, String contactId);
/**
* 根据id删除
* @param id
@@ -18,6 +18,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.drafting.common.DraftingConstant;
import com.jero.drafting.entity.PayDraftingGroup;
import com.jero.drafting.entity.PayDraftingGroupSubItem;
@@ -28,6 +29,7 @@ import com.jero.drafting.service.IPayDraftingGroupService;
import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService;
import com.jero.drafting.service.IPayDraftingGroupSubItemService;
import com.jero.drafting.vo.CheckVo;
import com.jero.meeting.entity.PayMeetingSituation;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.service.ISysUserService;
import com.jero.temporary.entity.PayCompanyManagementTemporary;
@@ -207,7 +209,32 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl<PayDraftingG
}
}
}
@Override
public CompanyInfoVO queryInfoByDraftIdAndContactId(String draftId, String contactId) {
LambdaQueryWrapper<PayDraftingGroupSubItemContacts> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId, draftId);
wrapper.eq(PayDraftingGroupSubItemContacts::getContactsId, contactId);
PayDraftingGroupSubItemContacts one = payDraftingGroupSubItemContactsService.getOne(wrapper);
if (one == null){
return null;
}
CompanyInfoVO companyInfoVO = new CompanyInfoVO();
//查询企业信息
String draftingGroupSubId = one.getDraftingGroupSubId();
PayDraftingGroupSubItem groupSubItem = this.getById(draftingGroupSubId);
String companyId = groupSubItem.getChargeCompanyId();
PayCompanyManagement companyManagement = payCompanyManagementService.getById(companyId);
companyInfoVO.setCompanyManagement(companyManagement);
//查询联系人信息
LambdaQueryWrapper<PayDraftingGroupSubItemContacts> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId, draftId);
wrapper1.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, draftingGroupSubId);
List<PayDraftingGroupSubItemContacts> subItemContactsList = payDraftingGroupSubItemContactsService.list(wrapper1);
List<String> contactIdList = subItemContactsList.stream().map(PayDraftingGroupSubItemContacts::getContactsId).collect(Collectors.toList());
List<PayContactsManagement> contactsManagementList = payContactsManagementService.listByIds(contactIdList);
companyInfoVO.setContactsManagementList(contactsManagementList);
return companyInfoVO;
}
/**
* 插入企业信息,联系人信息到临时表,更新项目记录
*