Merge remote-tracking branch 'origin/master'

jiangping

2024-01-31 31a2a1e82c6d1a80b62ef65bcfba46e084e372aa

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

@@ -55,6 +55,7 @@
        return member.getId();
    }


    @Override
    public void deleteById(Integer id) {
        memberMapper.deleteById(id);
@@ -218,7 +219,8 @@

    @Override
    public List<Member> findListByDTO(MemberQueryDTO memberQueryDTO) {
        List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()

        MPJLambdaWrapper<Member> lambdaWrapper = new MPJLambdaWrapper<Member>()
                .selectAll(Member.class)
                .selectAs(DispatchUnit::getName,Member::getDuName)
                .selectAs(Worktype::getName,Member::getWorkTypeName)
@@ -228,9 +230,25 @@
                .eq(!Objects.isNull(memberQueryDTO.getCompanyId()),Member::getCompanyId,memberQueryDTO.getCompanyId())
                .eq(Member::getIsdeleted, Constants.ZERO)
                .like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName())
                .notExists(!Objects.isNull(memberQueryDTO.getInsuranceApplyId()),
                        " select 1 from apply_detail ad where ad.applyId = "+memberQueryDTO.getInsuranceApplyId()+" and ad.END_TIME > now() and ad.isdeleted = 0 " +
                                " and ad.member_id = t.id ")
                .notExists(!Objects.isNull(memberQueryDTO.getNotInInsuranceApplyId()),
                        " select 1 from apply_detail ad where ad.apply_id = "+memberQueryDTO.getNotInInsuranceApplyId()+" and ad.END_TIME > now() and ad.isdeleted = 0 " +
                                " and ad.member_id = t.id ");
        if(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())){
            lambdaWrapper = new MPJLambdaWrapper<Member>()
                    .selectAll(Member.class)
                    .selectAs(DispatchUnit::getName,Member::getDuName)
                    .selectAs(Worktype::getName,Member::getWorkTypeName)
                    .leftJoin(ApplyDetail.class,ApplyDetail::getMemberId,Member::getId)
                    .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
                    .leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
                    .leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
                    .eq(Member::getIsdeleted, Constants.ZERO)
                    .eq(InsuranceApply::getId,memberQueryDTO.getInsuranceApplyId())
                    .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 ");
        }
        List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,lambdaWrapper
        );
        return memberList;
    }
@@ -267,14 +285,17 @@
            if(CollectionUtils.isNotEmpty(list)){
                Member member = list.stream().filter(m->m.getIdcardNo().equals(model.getIdCard())).findAny().get();
                if(!Objects.isNull(member)){
                    model.setWorkTypeId(member.getWorktypeId());
                    model.setWorkTypeName(member.getWorkTypeName());
                    model.setDuId(member.getDuId());
                    model.setDuName(member.getDuName());
//                    model.setWorkTypeId(member.getWorktypeId());
//                    model.setWorkTypeName(member.getWorkTypeName());
                    model.setIdCard(member.getIdcardNo());
//                    model.setDuId(member.getDuId());
//                    model.setDuName(member.getDuName());
                    model.setSex(member.getSex());
                }else{
                    model.setSex(Constants.getSexByIdCard(model.getIdCard()));
                }
            }else{
                model.setSex(Constants.getSexByIdCard(model.getIdCard()));
            }
        }
        return dataList;