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

liukangdong

2024-06-11 4c40dff48454e0eeb80d6db068d28a5bb259bde0

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java

@@ -11,11 +11,13 @@
import com.doumee.dao.business.ApproveTemplMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveParamDataVO;
import com.doumee.service.business.ApproveTemplService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,6 +26,8 @@

import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

/**
 * 审批模版信息表Service实现
@@ -67,6 +71,7 @@
            template.setName(Constants.ApproveTmplType.getName(model.getType()));
            approveTemplMapper.insert(template);
        }
        int level = 0;
        if(model.getParamList()!=null && model.getParamList().size()>0){
            for(ApproveParam param : model.getParamList()){
                param.setCreateDate(date);
@@ -74,11 +79,14 @@
                param.setEditDate(date);
                param.setEditor(loginUserInfo.getId());
                param.setIsdeleted(Constants.ZERO);
//                param.setLevel(level);
                param.setMemberType(Constants.formatIntegerNum(param.getMemberType()));
                param.setTemplId(template.getId());
                param.setType(Constants.formatIntegerNum(param.getType()));
                param.setAddrParam(Constants.formatIntegerNum(param.getAddrParam()));
                param.setDriverParam(Constants.formatIntegerNum(param.getDriverParam()));
                param.setApproveType(Constants.formatIntegerNum(param.getApproveType()));
                level ++ ;
            }
            //先清除原来所有的就陪配置
            approveParamMapper.delete(new UpdateWrapper<ApproveParam>().lambda()
@@ -86,7 +94,7 @@
            //批量插入新的配置
            approveParamMapper.insertBatchSomeColumn(model.getParamList());
        }
        return model.getId();
        return 1;
    }

    @Override
@@ -144,7 +152,22 @@
    @Override
    public ApproveTempl findOne(ApproveTempl approveTempl) {
        QueryWrapper<ApproveTempl> wrapper = new QueryWrapper<>(approveTempl);
        return approveTemplMapper.selectOne(wrapper);
        ApproveTempl model =  approveTemplMapper.selectOne(wrapper.lambda().last("limit 1"));
        if(model!=null){
            List<ApproveParam> approveParamList = approveParamMapper.selectList(new QueryWrapper<ApproveParam>()
                    .lambda().eq(ApproveParam::getIsdeleted,Constants.ZERO)
                    .eq(ApproveParam::getTemplId,model.getId())
                    .orderByAsc(ApproveParam::getLevel)
            );
            for (ApproveParam approveParam :approveParamList) {
                if(StringUtils.isNotBlank(approveParam.getObjIds())){
                    approveParam.setMemberList(memberMapper.selectList(new QueryWrapper<Member>()
                            .lambda().eq(Member::getIsdeleted,Constants.ZERO).in(Member::getId,approveParam.getObjIds().split(","))));
                }
            }
            model.setParamList(approveParamList);
        }
        return model;
    }

    @Override