Merge remote-tracking branch 'origin/master'

doum

昨天 2f3221b7c90d5663fdb312653a2d188bc4628370

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

@@ -214,22 +214,23 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        Member model = pageWrap.getModel();
        queryWrapper.selectAll(Member.class)
                .selectAs(Category::getName, Member::getLevelName)
                .select("t2.`NAME`", Member::getLevelName)
                .selectAs(SystemUser::getRealname, Member::getUpdateUserName)
                .leftJoin(SystemUser.class,SystemUser::getId,Member::getUpdateUser)
                .leftJoin(Category.class,Category::getId,Member::getLevelId)
                .apply(Objects.nonNull(model.getBustypeIds())," find_in_set( '["+model.getBustypeIds()+"]', t.BUSTYPE_IDS ) ")
//                .leftJoin(Category.class,Category::getId,Member::getLevelId)
                .leftJoin(" ( select c.* from category c  where c.deleted = 0 and c.status = 0 and c.type = 3  )   t2  on t.level_id = t2.id   ")
//                .apply(Objects.nonNull(model.getBustypeIds())," find_in_set( '["+model.getBustypeIds()+"]', t.BUSTYPE_IDS ) ")
                .apply(Objects.nonNull(model.getZhanquIds())," find_in_set( '["+model.getZhanquIds()+"]', t.ZHANQU_IDS ) ")
                .like(StringUtils.isNotBlank(model.getName()),Member::getName, model.getName())
                .eq(Objects.nonNull(model.getImportId()),Member::getImportId, model.getImportId())
                .eq(Objects.nonNull(model.getStatus()),Member::getStatus, model.getStatus())
                .eq(model.getContainDeleted()!=1,Member::getDeleted, Constants.ZERO)
                .in(Objects.nonNull(model.getLevelId()),Category::getId, model.getLevelId())
                .in(Objects.nonNull(model.getLevelId()),"t2.id", model.getLevelId())
                .eq(Objects.nonNull(model.getCode()),Member::getCode, model.getCode())
                .orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.ZERO),Member::getFee)
                .orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.ONE),Member::getFee)
                .orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.TWO),Category::getDetail)
                .orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.THREE),Category::getDetail)
                .orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.TWO),"t2.SORTNUM")
                .orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.THREE),"t2.SORTNUM")
                .orderByDesc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.FOUR),Member::getServeNum)
                .orderByDesc(Member::getId)
        ;
@@ -242,17 +243,32 @@
                 ) {
                sql = sql + (StringUtils.isNotBlank(sql)?" or ":"") + " find_in_set( '["+s+"]' , t.FIELD_IDS ) ";
            }
            queryWrapper.apply(sql);
            queryWrapper.apply("("+sql+")");
        }


        if(CollectionUtils.isNotEmpty(model.getBustypeIdList())){
            String sql = "";
            for (Integer s:model.getBustypeIdList()
            ) {
                sql = sql + (StringUtils.isNotBlank(sql)?" or ":"") + " find_in_set( '["+s+"]' , t.BUSTYPE_IDS ) ";
            }
            queryWrapper.apply("("+sql+")");
        }

        if (StringUtils.isNotBlank(model.getQueryZQCode())) {
            Category zhanqu = categoryMapper.selectOne(new QueryWrapper<Category>().lambda()
            List<Category> zhanquList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
                    .eq(Category::getDeleted,Constants.ZERO)
                    .eq(Category::getStatus,Constants.ZERO)
                    .eq(Category::getDetail,model.getQueryZQCode())
                    .apply(" find_in_set(detail,'"+model.getQueryZQCode()+"') ")
                    .last(" limit 1")
            );
            if(Objects.nonNull(zhanqu)){
                queryWrapper.apply(" find_in_set( '["+zhanqu.getId()+"]', t.ZHANQU_IDS ) ");
            if(CollectionUtils.isNotEmpty(zhanquList)){
                String sql = "";
                for (Category s:zhanquList) {
                    sql = sql + (StringUtils.isNotBlank(sql)?" or ":"") + " find_in_set( '["+s.getId()+"]' , t.ZHANQU_IDS ) ";
                }
                queryWrapper.apply("("+sql+")");
            }
        }
        IPage<Member> memberIPage  = memberMapper.selectJoinPage(page, Member.class, queryWrapper);
@@ -273,7 +289,9 @@
               if(member.getJobYear()!=null){
                    member.setWorkYears(DateUtil.getCurrentYear( ) - member.getJobYear()+1);
                }
               member.setServeNum(Constants.formatIntegerNum(member.getServeNum()));
            }

        }
        return PageData.from(memberIPage);
    }
@@ -310,7 +328,7 @@


    @Override
    public Member findDetailById(Integer id,String userRole) {
    public Member findDetailById(Integer id) {
        Member member = memberMapper.selectJoinOne(Member.class, new MPJLambdaWrapper<Member>()
                .selectAll(Member.class)
                .select(" c1.NAME ", Member::getPromotionName)
@@ -334,23 +352,34 @@
           );
       }

        List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
                        .eq(Category::getDeleted, Constants.ZERO)
//                    .eq(Category::getType,Constants.TWO)
                        .orderByAsc(Category::getSortnum)
        );
        if(CollectionUtils.isNotEmpty(categoryList)){
            dealMemberField(member,categoryList);
            dealMemberCategoryList(member, categoryList,Constants.ONE);
        }

        String resourcePath = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode();
        String path =  systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER_FILES).getCode();
        String roleConfig = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ROLE_CONFIG).getCode();
        member.setFullImgurl(StringUtils.isNotBlank(member.getImgurl())?(resourcePath  + path + member.getImgurl()):"");
        List<Cases> casesList = casesMapper.selectList(new QueryWrapper<Cases>().lambda()
                .eq(Cases::getMemberId,member.getId())
                .eq(Cases::getDeleted,Constants.ZERO)
                .eq(Cases::getStatus,Constants.ZERO)
                .orderByDesc(Cases::getStartDate)
                .orderByDesc(Cases::getId)
        );
        if(CollectionUtils.isNotEmpty(casesList)){
            String casePath =  systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.CATEGORY_FILES).getCode();
            String casePath =  systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.CASES_FILES).getCode();
            for (Cases cases:casesList) {
                List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
                        .eq(Multifile::getObjId,cases.getId())
                        .eq(Multifile::getObjType,Constants.ONE)
                        .eq(Multifile::getIsdeleted,Constants.ZERO)
                        .orderByDesc(Multifile::getId)
                        .orderByAsc(Multifile::getId)
                );
                multifileList.forEach(multifile -> {
                    multifile.setUrl(StringUtils.isNotBlank(multifile.getFileurl())?(resourcePath  + casePath + multifile.getFileurl()):"");
@@ -358,10 +387,6 @@
                cases.setFileList(multifileList);
            }
            member.setCasesList(casesList);
        }
        if(StringUtils.isBlank(roleConfig)||StringUtils.isBlank(userRole)
                || !(roleConfig.contains(userRole)||userRole.equals(Constants.DD_USER_TYPE) )){
            member.setFee(null);
        }
        return member;
    }