k94314517
2024-07-03 ca133ed72b297141f906810f81413e15d3d66333
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveTemplServiceImpl.java
@@ -9,14 +9,14 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ApproveParamMapper;
import com.doumee.dao.business.ApproveTemplMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
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 com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +26,6 @@
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
 * 审批模版信息表Service实现
@@ -42,7 +40,7 @@
    @Autowired
    private ApproveParamMapper approveParamMapper;
    @Autowired
    private MemberMapper memberMapper;
    private MemberJoinMapper memberJoinMapper;
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -92,7 +90,7 @@
            approveParamMapper.delete(new UpdateWrapper<ApproveParam>().lambda()
                    .eq(ApproveParam::getTemplId,template.getId()));
            //批量插入新的配置
            approveParamMapper.insertBatchSomeColumn(model.getParamList());
            approveParamMapper.insert(model.getParamList());
        }
        return 1;
    }
@@ -161,8 +159,12 @@
            );
            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(","))));
                    approveParam.setMemberList(memberJoinMapper.selectJoinList(Member.class,new MPJLambdaWrapper<Member>()
                            .selectAll(Member.class)
                            .selectAs(Company::getName,Member::getCompanyName)
                            .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                            .eq(Member::getIsdeleted,Constants.ZERO)
                            .in(Member::getId,approveParam.getObjIds().split(","))));
                }
            }
            model.setParamList(approveParamList);