Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-06-27 9dc0d681e17d735ff42195a29e6905f4ee9f01da

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

@@ -243,6 +243,7 @@
        }

        queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getDuId()),ApplyDetail::getDuId,applyDetailPageDTO.getDuId());
        queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getCompanyId()),InsuranceApply::getCompanyId,applyDetailPageDTO.getCompanyId());
        queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getWorkTypeId()),ApplyDetail::getWorktypeId,applyDetailPageDTO.getWorkTypeId());
        queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getUnionApplyId()),ApplyDetail::getUnionApplyId,applyDetailPageDTO.getUnionApplyId());
        queryWrapper.like(StringUtils.isNotBlank(applyDetailPageDTO.getMemberName()),Member::getName,applyDetailPageDTO.getMemberName());
@@ -299,6 +300,64 @@


    @Override
    public PageData<ApplyDetail> findPageForMini(PageWrap<ApplyDetailPageDTO> pageWrap) {
        IPage<ApplyDetail> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());

        MPJLambdaWrapper<ApplyDetail> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.selectAll(ApplyDetail.class);
        queryWrapper.selectAs(DispatchUnit::getName,ApplyDetail::getDuName);
        queryWrapper.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName);
        queryWrapper.selectAs(Member::getIdcardNo,ApplyDetail::getIdcardNo);
        queryWrapper.selectAs(Member::getName,ApplyDetail::getMemberName);
        queryWrapper.selectAs(Solutions::getName,ApplyDetail::getSolutionName);
        queryWrapper.selectAs(Solutions::getType,ApplyDetail::getSolutionType);
        queryWrapper.selectAs(Company::getName,ApplyDetail::getCompanyName);
        queryWrapper.selectAs(InsuranceApply::getStatus,ApplyDetail::getStatus);
        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(Company.class,Company::getId,InsuranceApply::getCompanyId);
        queryWrapper.eq(ApplyDetail::getIsdeleted,Constants.ZERO);

        ApplyDetailPageDTO applyDetailPageDTO = pageWrap.getModel();
        queryWrapper.eq(!Objects.isNull(applyDetailPageDTO.getCompanyId()),InsuranceApply::getCompanyId,applyDetailPageDTO.getCompanyId());
        queryWrapper.in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_DONE.getKey());
        queryWrapper.and(StringUtils.isNotBlank(applyDetailPageDTO.getMemberName()),i->i.like(Member::getIdcardNo,applyDetailPageDTO.getMemberName()).or().like(Member::getName,applyDetailPageDTO.getMemberName()));

        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(pageWrap.getSorts())){
            for(PageWrap.SortData sortData: pageWrap.getSorts()) {
                if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                    queryWrapper.orderByDesc(sortData.getProperty());
                } else {
                    queryWrapper.orderByAsc(ApplyDetail::getSortnum);
                }
            }
        }else{
            queryWrapper.orderByAsc(ApplyDetail::getSortnum);
        }
        PageData<ApplyDetail> pageData = PageData.from(applyDetailJoinMapper.selectJoinPage(page,ApplyDetail.class, queryWrapper));
        if(pageData.getRecords()!=null){
            int num = 1;
            for (ApplyDetail d : pageData.getRecords()){
                d.setSortnum(num++);
                if(d.getEndTime().getTime()<System.currentTimeMillis()){
                    d.setStatus(0);
                }else{
                    d.setStatus(1);
                }
                if(StringUtils.isNotBlank(d.getIdcardNo())){
                    d.setAge(Constants.getAgeByIdCard(d.getIdcardNo()));
                }
            }
        }
        return pageData;
    }


    @Override
    public List<ApplyDetail> findListForCompany(ApplyDetailPageDTO applyDetailPageDTO) {
        MPJLambdaWrapper<ApplyDetail> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(ApplyDetail.class);