From 988072e4a8139b0c8930686505c02b7fac4405f3 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 11 Sep 2024 13:57:36 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E9=80=9A=E8=BF=87=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84id=E5=92=8C=E5=8F=82=E4=BC=9A=E4=BA=BAid=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF=E5=92=8C=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/config/shiro/ShiroConfig.java | 1 + .../PayDraftingGroupSubItemController.java | 12 ++++++++ .../IPayDraftingGroupSubItemService.java | 3 ++ .../PayDraftingGroupSubItemServiceImpl.java | 29 ++++++++++++++++++- 4 files changed, 44 insertions(+), 1 deletion(-) 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 44a0100d..59937ee0 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 @@ -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"); //门户端-分页查询所有会员名称 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index ef596a62..43d08824 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -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 queryInfoByDraftIdAndContactId(@RequestParam(name = "draftId") String draftId, + @RequestParam(name = "contactId") String contactId) { + CompanyInfoVO companyInfoVO = payDraftingGroupSubItemService.queryInfoByDraftIdAndContactId(draftId,contactId); + return Result.OK(companyInfoVO); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java index 1a6ccd27..3470c48b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java @@ -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 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 wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId, draftId); + wrapper1.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, draftingGroupSubId); + List subItemContactsList = payDraftingGroupSubItemContactsService.list(wrapper1); + List contactIdList = subItemContactsList.stream().map(PayDraftingGroupSubItemContacts::getContactsId).collect(Collectors.toList()); + List contactsManagementList = payContactsManagementService.listByIds(contactIdList); + companyInfoVO.setContactsManagementList(contactsManagementList); + return companyInfoVO; + } /** * 插入企业信息，联系人信息到临时表，更新项目记录 *