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 43d08824..5dfab11f 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 @@ -24,7 +24,6 @@ import com.jero.drafting.vo.CheckVo; import com.jero.drafting.vo.PayDraftingGroupSubItemExcel; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; -import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import io.swagger.annotations.Api; @@ -640,11 +639,11 @@ public class PayDraftingGroupSubItemController extends JeroController queryInfoByDraftIdAndContactId(@RequestParam(name = "draftId") String draftId, - @RequestParam(name = "contactId") String contactId) { - CompanyInfoVO companyInfoVO = payDraftingGroupSubItemService.queryInfoByDraftIdAndContactId(draftId,contactId); + @ApiOperation(value = "通过起草组id和企业id查询企业信息和所有联系人信息") + @GetMapping(value = "/queryInfoByDraftIdAndCompanyId") + public Result queryInfoByDraftIdAndCompanyId(@RequestParam(name = "draftId") String draftId, + @RequestParam(name = "companyId") String companyId) { + CompanyInfoVO companyInfoVO = payDraftingGroupSubItemService.queryInfoByDraftIdAndCompanyId(draftId, companyId); 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 3470c48b..f9c19134 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 @@ -35,7 +35,7 @@ public interface IPayDraftingGroupSubItemService extends IService * 起草组成员表 服务实现类 @@ -210,19 +213,17 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId, draftId); - wrapper.eq(PayDraftingGroupSubItemContacts::getContactsId, contactId); - PayDraftingGroupSubItemContacts one = payDraftingGroupSubItemContactsService.getOne(wrapper); + public CompanyInfoVO queryInfoByDraftIdAndCompanyId(String draftId, String companyId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayDraftingGroupSubItem::getDraftingGroupId, draftId); + wrapper.eq(PayDraftingGroupSubItem::getChargeCompanyId, companyId); + PayDraftingGroupSubItem one = payDraftingGroupSubItemService.getOne(wrapper); if (one == null){ return null; } CompanyInfoVO companyInfoVO = new CompanyInfoVO(); //查询企业信息 - String draftingGroupSubId = one.getDraftingGroupSubId(); - PayDraftingGroupSubItem groupSubItem = this.getById(draftingGroupSubId); - String companyId = groupSubItem.getChargeCompanyId(); + String draftingGroupSubId = one.getId(); PayCompanyManagement companyManagement = payCompanyManagementService.getById(companyId); companyInfoVO.setCompanyManagement(companyManagement); //查询联系人信息