jiangping
2023-12-14 e2f8fb1fbe26ba6d92f3e5dfcaeb0c69abe76b25
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -353,7 +353,7 @@
        MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
        MemberInfoDTO model = pageWrap.getModel();
        Utils.MP.blankToNull(model);
        Date end = Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime());
        Date end =pageWrap.getModel().getTrainTimeEndTime() !=null? Utils.Date.getEnd(pageWrap.getModel().getTrainTimeEndTime()):new Date();
        queryWrapper.leftJoin(Company.class,Company::getId,Member::getCompanyId)
                .leftJoin(TrainTime.class,TrainTime::getMemberId,Member::getId)
                .leftJoin(Empower.class,Empower::getMemberId,Member::getId);
@@ -368,7 +368,7 @@
                    .like(StringUtils.isNotBlank(model.getName()),Member::getName,model.getName())
                    .like(StringUtils.isNotBlank(model.getPhone()),Member::getPhone,model.getPhone())
                    .like(StringUtils.isNotBlank(model.getIdcardDecode()),Member::getIdcardDecode,model.getIdcardDecode())
                    .having("trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
                    .having(pageWrap.getModel().getTrainTimeEndTime()!=null,"trainTimeEndTime < "+ DateUtil.format(end,"yyyy-MM-dd HH:mm:ss"));
        IPage<MemberInfoDTO> memberIPage = memberJoinMapper.selectJoinPage(page, MemberInfoDTO.class,queryWrapper);
        if (!CollectionUtils.isEmpty(memberIPage.getRecords())){
            memberIPage.getRecords().forEach(s->s.setSex(IdcardUtil.getGenderByIdCard(s.getIdcardDecode())));
@@ -451,6 +451,7 @@
                .eq("m.ISDELETED",0)
                .orderByDesc("m.CREATE_DATE")
        );
        return PageData.from(memberIPage);
    }