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

MrShi

2026-01-30 e6e520abd96702db6b29459a66440801f58bc89d

 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;
@@ -24,7 +25,9 @@
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;

@@ -58,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
@@ -72,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);
    }

@@ -109,6 +202,7 @@

    @Override
    public List<Member> findList(Member member) {
        member.setDeleted(Constants.ZERO);
        QueryWrapper<Member> wrapper = new QueryWrapper<>(member);
        return memberMapper.selectList(wrapper);
    }
@@ -129,13 +223,14 @@
                .like(StringUtils.isNotBlank(model.getName()),Member::getName, model.getName())
                .eq(Objects.nonNull(model.getStatus()),Member::getStatus, model.getStatus())
                .eq(Member::getDeleted, Constants.ZERO)
                .in(Objects.nonNull(model.getLevelId()),Member::getStatus, model.getStatus())
                .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),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(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);
@@ -175,8 +270,8 @@
                    }
                }
                member.setFullImgurl(StringUtils.isNotBlank(member.getImgurl())?(path + member.getImgurl()):"");
                if(StringUtils.isBlank(roleConfig)||StringUtils.isBlank(model.getQueryUserRole())
                || !roleConfig.contains(model.getQueryUserRole())){
                if(!Constants.equalsInteger(pageWrap.getModel().getQueryFlag(),Constants.ONE) && (StringUtils.isBlank(roleConfig)||StringUtils.isBlank(model.getQueryUserRole())
                        || !roleConfig.contains(model.getQueryUserRole()))){
                    member.setFee(null);
                }
               if(member.getJobYear()!=null){
@@ -188,6 +283,9 @@
    }

    private void dealMemberCategoryList(Member member, List<Category> categoryList) {
        member.setFieldIdList(new ArrayList<>());
        member.setBustypeIdList(new ArrayList<>());
        member.setZhanquIdList(new ArrayList<>());
        member.setFieldList(new ArrayList<>());
        member.setTypeList(new ArrayList<>());
        member.setZqList(new ArrayList<>());
@@ -196,14 +294,17 @@
            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.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);
                member.getFieldIdList().add(c.getId());
            }
        }
    }