111

k94314517

2024-02-19 deb3baf0fb04c3a9f5b0d4b5bd9fb3237908d576

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

@@ -211,14 +211,15 @@
                .apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.ONE),"now() between t.start_time and t.end_time")
                .apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.TWO),"now()  >  t.end_time")
        ;

        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
         queryWrapper.orderByAsc(DispatchUnit::getName);
         queryWrapper.orderByAsc(Member::getName);
//        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
//            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
//                queryWrapper.orderByDesc(sortData.getProperty());
//            } else {
//                queryWrapper.orderByAsc(sortData.getProperty());
//            }
//        }
        PageData<Member> pageData = PageData.from(memberJoinMapper.selectJoinPage(page,Member.class, queryWrapper));
        return pageData;
    }
@@ -262,6 +263,8 @@
                    .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
                    .eq(Member::getIsdeleted, Constants.ZERO)
                    .eq(InsuranceApply::getId,memberQueryDTO.getInsuranceApplyId())
                    .le(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getStartTime,memberQueryDTO.getValidTime())
                    .ge(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getEndTime,memberQueryDTO.getValidTime())
                    .exists(!Objects.isNull(memberQueryDTO.getInsuranceApplyId()),
                            " select 1 from apply_detail ad where ad.apply_id = "+memberQueryDTO.getInsuranceApplyId()+" and ad.END_TIME > now() and ad.isdeleted = 0 " +
                                    " and ad.member_id = t.id ");