From a43f9d75a9e0ba2720b3c438a0c5ece7be0eb110 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期三, 28 五月 2025 18:23:45 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java index 0134629..529c16c 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java @@ -307,16 +307,20 @@ queryWrapper.selectAs(Solutions::getId,ApplyDetail::getSolutionId); queryWrapper.selectAs(Solutions::getName,ApplyDetail::getSolutionName); queryWrapper.selectAs(Solutions::getType,ApplyDetail::getSolutionType); + queryWrapper.selectAs(Insurance::getBaseId,ApplyDetail::getInsuranceId); queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName); queryWrapper.selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo); queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName); queryWrapper.selectAs(InsuranceApply::getStartTime,ApplyDetail::getParentStartTime); queryWrapper.selectAs(InsuranceApply::getEndTime,ApplyDetail::getParentEndTime); + + queryWrapper.selectAs(Solutions::getParentId,ApplyDetail::getSolutionBaseId); queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId); queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId); queryWrapper.leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId); queryWrapper.leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId); queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId); + queryWrapper.leftJoin(Insurance.class,Insurance::getId,Solutions::getInsuranceId); queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getApplyId()),ApplyDetail::getApplyId,applyDetailPageDTO.getApplyId()); queryWrapper.ge(!Objects.isNull(applyDetailPageDTO.getApplyStatus()) &&!applyDetailPageDTO.getApplyStatus().equals(Constants.ZERO), -- Gitblit v1.9.3