Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbom_dian...

MrShi

8 天以前 cb94ff4f0a46eb74c21dd7b34b8d958ef9a9f11c

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

@@ -8,6 +8,7 @@
import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
@@ -20,10 +21,13 @@
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Multifile;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.MemberService;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@@ -57,13 +61,64 @@

    @Override
    public Integer create(Member member) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(StringUtils.isBlank(member.getCode())
                ||StringUtils.isBlank(member.getName())
                ||StringUtils.isBlank(member.getImgurl())
                ||StringUtils.isBlank(member.getContent())
                ||member.getZhanquIdList()==null
                ||member.getZhanquIdList().size()==0
                ||member.getBustypeIdList()==null
                ||member.getBustypeIdList().size()==0
                ||member.getFieldIdList()==null
                ||member.getFieldIdList().size()==0
                ||member.getLevelId()==null  ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                .eq(Member::getCode,member.getCode())
                .eq(Member::getDeleted,Constants.ZERO)
                .eq(Member::getType,member.getType()))>0 ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"工号已存在，请确认后重新录入");
        }
        member.setDeleted(Constants.ZERO);
        member.setCreateTime(new Date());
        member.setCreateUser(loginUserInfo.getId());
        member.setUpdateTime(new Date());
        member.setUpdateUser(loginUserInfo.getId());
        member.setZhanquIds(getIdsStrFromList(member.getZhanquIdList()));
        member.setFieldIds(getIdsStrFromList(member.getFieldIdList()));
        member.setBustypeIds(getIdsStrFromList(member.getBustypeIdList()));
        memberMapper.insert(member);

        return member.getId();
    }

    private String getIdsStrFromList(List<Integer> zhanquIdList) {
        String t = "";
        if(zhanquIdList!=null && zhanquIdList.size()>0){
            for (int i = 0; i < zhanquIdList.size(); i++) {
                if(zhanquIdList.get(i)==null){
                    continue;
                }
                if(StringUtils.isNotBlank(t)){
                    t+=",";
                }
                t+="["+zhanquIdList.get(i)+"]";
            }
        }
        return t;
    }

    @Override
    public void deleteById(Integer id) {
        memberMapper.deleteById(id);
        Member member =new Member();
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        member.setUpdateTime(new Date());
        member.setId(id);
        member.setUpdateUser(loginUserInfo.getId());
        member.setDeleted(Constants.ONE);
        memberMapper.updateById(member);
    }

    @Override
@@ -71,17 +126,56 @@
        UpdateWrapper<Member> deleteWrapper = new UpdateWrapper<>(member);
        memberMapper.delete(deleteWrapper);
    }

    @Override
    public void updateStatus(Member member) {
        if(Objects.isNull(member) || Objects.isNull(member.getId())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        member.setUpdateTime(new Date());
        member.setUpdateUser(loginUserInfo.getId());
        memberMapper.updateById(member);
    }
    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        memberMapper.deleteBatchIds(ids);
        for(Integer id : ids){
            this.deleteById(id);
        }
    }

    @Override
    public void updateById(Member member) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(StringUtils.isBlank(member.getCode())
                ||StringUtils.isBlank(member.getName())
                ||StringUtils.isBlank(member.getImgurl())
                ||StringUtils.isBlank(member.getContent())
                ||member.getId()==null
                ||member.getZhanquIdList()==null
                ||member.getZhanquIdList().size()==0
                ||member.getBustypeIdList()==null
                ||member.getBustypeIdList().size()==0
                ||member.getFieldIdList()==null
                ||member.getFieldIdList().size()==0
                ||member.getLevelId()==null  ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
                .eq(Member::getCode,member.getCode())
                 .ne(Member::getId,member.getId())
                .eq(Member::getDeleted,Constants.ZERO)
                .eq(Member::getType,member.getType()))>0 ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"工号已存在，请确认后重新录入");
        }
        member.setUpdateTime(new Date());
        member.setUpdateUser(loginUserInfo.getId());
        member.setAddType(Constants.ZERO);
        member.setZhanquIds(getIdsStrFromList(member.getZhanquIdList()));
        member.setFieldIds(getIdsStrFromList(member.getFieldIdList()));
        member.setBustypeIds(getIdsStrFromList(member.getBustypeIdList()));
        memberMapper.updateById(member);
    }

@@ -108,6 +202,7 @@

    @Override
    public List<Member> findList(Member member) {
        member.setDeleted(Constants.ZERO);
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
        return memberMapper.selectList(wrapper);
    }
@@ -120,22 +215,34 @@
        Member model = pageWrap.getModel();
        queryWrapper.selectAll(Member.class)
                .selectAs(Category::getName, 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 ) ")
                .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())
                .orderByAsc(Objects.isNull(model.getOrderByType()),"c2.DETAIL")
                .eq(model.getContainDeleted()!=1,Member::getDeleted, Constants.ZERO)
                .in(Objects.nonNull(model.getLevelId()),Category::getId, 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),"c2.DETAIL")
                .orderByAsc(Objects.nonNull(model.getOrderByType())&&Constants.equalsInteger(model.getOrderByType(), Constants.THREE),"c2.DETAIL")
                .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.FOUR),Member::getServeNum)
                .orderByDesc(Member::getId)
        ;
        if(StringUtils.isNotBlank(model.getFieldIds())){
            String [] fieldIds = model.getFieldIds().split(",");
            for (String s:fieldIds) {
                queryWrapper.apply("find_in_set( '["+s+"]' , t.FIELD_IDS )");
        if(Constants.equalsInteger(pageWrap.getModel().getQueryFlag(),Constants.ONE)){
            queryWrapper.select("(select count(c.id) from cases c where c.deleted=0 and c.member_id=t.id)",Member::getCaseNum);
        }
        if(CollectionUtils.isNotEmpty(model.getFieldIdList())){
            String sql = "";
            for (Integer s:model.getFieldIdList()
                 ) {
                sql = sql + (StringUtils.isNotBlank(sql)?" or ":"") + " find_in_set( '["+s+"]' , t.FIELD_IDS ) ";
            }
            queryWrapper.apply(sql);
        }
        if (StringUtils.isNotBlank(model.getQueryZQCode())) {
            Category zhanqu = categoryMapper.selectOne(new QueryWrapper<Category>().lambda()
@@ -148,7 +255,7 @@
                queryWrapper.apply(" find_in_set( '["+zhanqu.getId()+"]', t.ZHANQU_IDS ) ");
            }
        }
        IPage<Member> memberIPage  = memberMapper.selectJoinPage(page, Member.class, new MPJLambdaWrapper<>());
        IPage<Member> memberIPage  = memberMapper.selectJoinPage(page, Member.class, queryWrapper);
        if(CollectionUtils.isNotEmpty(memberIPage.getRecords())){
            List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
                    .eq(Category::getDeleted, Constants.ZERO)
@@ -157,17 +264,12 @@
            );
            String path = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode() +
                    systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.MEMBER_FILES).getCode();
            String roleConfig = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ROLE_CONFIG).getCode();
            for (Member member:memberIPage.getRecords()) {
                if(CollectionUtils.isNotEmpty(categoryList)){
                    dealMemberField(member,categoryList);
                    dealMemberCategoryList(member,categoryList);
                    dealMemberCategoryList(member, categoryList,pageWrap.getModel().getQueryFlag());
                }
                member.setFullImgurl(StringUtils.isNotBlank(member.getImgurl())?(path + member.getImgurl()):"");
                if(StringUtils.isBlank(roleConfig)||StringUtils.isBlank(model.getQueryUserRole())
                || !roleConfig.contains(model.getQueryUserRole())){
                    member.setFee(null);
                }
               if(member.getJobYear()!=null){
                    member.setWorkYears(DateUtil.getCurrentYear( ) - member.getJobYear()+1);
                }
@@ -176,30 +278,38 @@
        return PageData.from(memberIPage);
    }

    private void dealMemberCategoryList(Member member, List<Category> categoryList) {
    private void dealMemberCategoryList(Member member, List<Category> categoryList, Integer queryFlag) {
        member.setFieldList(new ArrayList<>());
        member.setTypeList(new ArrayList<>());
        member.setZqList(new ArrayList<>());
        member.setBustypeIdList(new ArrayList<>());
        member.setZhanquIdList(new ArrayList<>());
        for(Category c:categoryList){
//            0=战区;1=商业化;2=擅长领域;
            if(Constants.equalsInteger(c.getType(),Constants.ZERO)&& StringUtils.contains(member.getZhanquIds(),"["+c.getId()+"]")){
                //战区
                member.getZqList().add(c);
            }
            if(Constants.equalsInteger(c.getType(),Constants.ONE)&& StringUtils.contains(member.getBustypeIds(),"["+c.getId()+"]")){
                //商业化
                member.getTypeList().add(c);
                member.getBustypeIdList().add(c.getId());
            }
            if(Constants.equalsInteger(c.getType(),Constants.TWO) && StringUtils.contains(member.getFieldIds(),"["+c.getId()+"]")){
                //擅长领域
                member.getFieldList().add(c);
            if(Constants.equalsInteger(queryFlag,Constants.ONE)) {
                //            0=战区;1=商业化;2=擅长领域;
                if(Constants.equalsInteger(c.getType(),Constants.ZERO)&& StringUtils.contains(member.getZhanquIds(),"["+c.getId()+"]")){
                    //战区
                    member.getZqList().add(c);
                    member.getZhanquIdList().add(c.getId());
                }
                if(Constants.equalsInteger(c.getType(),Constants.TWO) && StringUtils.contains(member.getFieldIds(),"["+c.getId()+"]")){
                    //擅长领域
                    member.getFieldList().add(c);
                    member.getFieldIdList().add(c.getId());
                }
            }

        }
    }


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

        String resourcePath = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.RESOURCE_PATH).getCode();
        String path =  systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.CATEGORY_FILES).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()
@@ -233,7 +343,7 @@
                .orderByDesc(Cases::getId)
        );
        if(CollectionUtils.isNotEmpty(casesList)){
            String casePath =  systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.CASES_FILES).getCode();
            String casePath =  systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE, Constants.CATEGORY_FILES).getCode();
            for (Cases cases:casesList) {
                List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
                        .eq(Multifile::getObjId,cases.getId())
@@ -244,11 +354,12 @@
                multifileList.forEach(multifile -> {
                    multifile.setUrl(StringUtils.isNotBlank(multifile.getFileurl())?(resourcePath  + casePath + multifile.getFileurl()):"");
                });
                cases.setFileList(multifileList);
            }
            member.setCasesList(casesList);
        }
        if(StringUtils.isBlank(roleConfig)||StringUtils.isBlank(queryUserRole)
                || !roleConfig.contains(queryUserRole)){
        if(StringUtils.isBlank(roleConfig)||StringUtils.isBlank(userRole)
                || !(roleConfig.contains(userRole)||userRole.equals(Constants.DD_USER_TYPE) )){
            member.setFee(null);
        }
        return member;
@@ -278,4 +389,5 @@
    }



}