111

k94314517

2024-01-22 c8ad6f13c0e9cbff9a0763bc50c86576449f6e03

 server/service/src/main/java/com/doumee/service/business/impl/ApplyDetailServiceImpl.java

@@ -173,8 +173,18 @@
        queryWrapper.selectAs(DispatchUnit::getName,ApplyDetail::getDuName);
        queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
        queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName);
        queryWrapper.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId);
        queryWrapper.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId);
        queryWrapper.leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId);


        ApplyDetailPageDTO applyDetailPageDTO = pageWrap.getModel();
        queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getApplyId()),ApplyDetail::getApplyId,applyDetailPageDTO.getApplyId());

        queryWrapper.ge(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
                        &&!applyDetailPageDTO.getApplyStatus().equals(Constants.ZERO),
                ApplyDetail::getStartTime, DateUtil.getDate(new Date(),"yyyy-MM-dd")+" 00:00:00");

        //在保
        queryWrapper.le(!Objects.isNull(applyDetailPageDTO.getApplyStatus())
                &&applyDetailPageDTO.getApplyStatus().equals(Constants.ONE),
@@ -207,4 +217,32 @@
        QueryWrapper<ApplyDetail> wrapper = new QueryWrapper<>(applyDetail);
        return applyDetailMapper.selectCount(wrapper);
    }


    @Override
    public List<ApplyDetail> getMemberApplyList(Integer memberId) {
        List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,
                new MPJLambdaWrapper<ApplyDetail>()
                        .selectAll(ApplyDetail.class)
                        .selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
                        .selectAs(Worktype::getName,ApplyDetail::getWorkTypeName)
                        .selectAs(Member::getName,ApplyDetail::getMemberName)
                        .selectAs(Solutions::getName,ApplyDetail::getSolutionName)
                        .selectAs(ApplyChange::getValidCode,ApplyDetail::getValidCode)
                        .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
                        .leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
                        .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
                        .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
                        .leftJoin(Member.class,Member::getId,ApplyDetail::getMemberId)
                        .leftJoin(ApplyChagneDetail.class,ApplyChagneDetail::getId,ApplyDetail::getFromId)
                        .leftJoin(ApplyChange.class,ApplyChange::getId,ApplyChagneDetail::getApplyChangeId)
                        .eq(ApplyDetail::getMemberId,memberId)
                        .orderByAsc(ApplyDetail::getCreateDate)
        );
        return applyDetailList;
    }




}