Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 8a0469c97262be9ecbc5eae38d812da789635c81

 server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -7,15 +8,14 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DispatchUnitMapper;
import com.doumee.dao.business.DuLogMapper;
import com.doumee.dao.business.DuSolutionMapper;
import com.doumee.dao.business.DuWorktypeMapper;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.*;
import com.doumee.dao.business.join.DispatchUnitJoinMapper;
import com.doumee.dao.business.join.DuLogJoinMapper;
import com.doumee.dao.business.join.DuSolutionJoinMapper;
import com.doumee.dao.business.join.DuWorkTypeJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.DispatchUnitService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -31,6 +31,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import java.util.stream.Collectors;

/**
 * 派遣单位信息表Service实现
@@ -42,6 +43,9 @@

    @Autowired
    private DispatchUnitMapper dispatchUnitMapper;

    @Autowired
    private DispatchUnitJoinMapper dispatchUnitJoinMapper;

    @Autowired
    private DuSolutionMapper duSolutionMapper;
@@ -61,6 +65,12 @@
    @Autowired
    private DuWorkTypeJoinMapper duWorkTypeJoinMapper;

    @Autowired
    private SystemDictDataBiz systemDictDataBiz;

    @Autowired
    private NoticesMapper noticesMapper;

    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public Integer checkWorktype(DispatchUnit param) {
@@ -72,13 +82,13 @@
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        DispatchUnit model = dispatchUnitMapper.selectById(param.getId());
        if(Objects.isNull(model) || Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO) ||!Constants.equalsInteger(model.getDataType(),Constants.ZERO)){
        if(Objects.isNull(model) || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO) ||!Constants.equalsInteger(model.getDataType(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到派遣单位信息");
        }
        if(!Constants.equalsInteger(model.getStatus(),Constants.ONE)){
        if(!Constants.equalsInteger(model.getUnitStatus(),Constants.ONE)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该派遣单位尚未审核通过，不支持该操作！");
        }
        if(Constants.equalsInteger(model.getWorktypeStatus(),Constants.ZERO)){
        if(!Constants.equalsInteger(model.getWorktypeStatus(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该派遣单位工种已审核，请勿重复提交~");
        }
        DispatchUnit update = new DispatchUnit();
@@ -92,7 +102,10 @@
        dispatchUnitMapper.updateById(update);
        if(Constants.equalsInteger(param.getWorktypeStatus(),Constants.ONE)){
            //审核通过，修改状态，产生历史版本
            newVersionData(model,update);
            newVersionData(dispatchUnitMapper.selectById(param.getId()),update);
            //存储操作历史
            this.saveDuLog(update,Constants.DispatchUnitLogType.WORK_TYPE_AUDIT_PASS,update.getCheckInfo());

        }else{
            //更新明细数据为审核失败
            duSolutionMapper.update(null,new UpdateWrapper<DuSolution>().lambda()
@@ -101,7 +114,25 @@
                    .set(DuSolution::getCheckUserId,update.getCheckUserId())
                    .set(DuSolution::getCheckInfo,update.getCheckInfo())
                    .eq(DuSolution::getDispatchUnitId,update.getId()));

            duWorktypeMapper.update(null,new UpdateWrapper<DuWorktype>().lambda()
                    .set(DuWorktype::getStatus,Constants.TWO)
                    .set(DuWorktype::getCheckUserId,update.getCheckUserId())
                    .set(DuWorktype::getCheckInfo,update.getCheckInfo())
                    .set(DuWorktype::getCheckDate,new Date() )
                    .eq(DuWorktype::getIsdeleted,Constants.ZERO)
                    .eq(DuWorktype::getStatus,Constants.ZERO)
                    .eq(DuWorktype::getDispatchUnitId,update.getId()));
            //存储操作历史
            this.saveDuLog(update,Constants.DispatchUnitLogType.WORK_TYPE_AUDIT_UN_PASS,update.getCheckInfo());
        }


        //存储待办信息
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT;
        //删除其他待办
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,model.getId()));

        return  1;
    }

@@ -125,7 +156,20 @@
        List<DuWorktype> newWorktypes = new ArrayList<>();
        List<DuSolution> solutions = duSolutionMapper.selectList(new QueryWrapper<DuSolution>().lambda()
                .eq(DuSolution::getIsdeleted,Constants.ZERO)
                .eq(DuSolution::getDispatchUnitId,model.getSolutionId()));
                .eq(DuSolution::getDispatchUnitId,model.getId()));

        duSolutionMapper.update(null,new UpdateWrapper<DuSolution>().lambda()
                        .set(DuSolution::getStatus,Constants.ONE)
                .set(DuSolution::getCheckDate,update.getEditDate() )
                .set(DuSolution::getCheckUserId,update.getCheckUserId())
                .set(DuSolution::getCheckInfo,update.getCheckInfo())
                .eq(DuSolution::getIsdeleted,Constants.ZERO)
                .eq(DuSolution::getStatus,Constants.ZERO)
                .eq(DuSolution::getDispatchUnitId,model.getId())
        );



        if(solutions == null || solutions.size() ==0){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该派遣单位未设置方案工种信息，审核通过失败！");
        }
@@ -141,9 +185,21 @@
            List<DuWorktype> worktypes = duWorktypeMapper.selectList(new QueryWrapper<DuWorktype>().lambda()
                    .eq(DuWorktype::getIsdeleted,Constants.ZERO)
                    .eq(DuWorktype::getDuSolutionId,s.getId()));

            duWorktypeMapper.update(null,new UpdateWrapper<DuWorktype>().lambda()
                    .set(DuWorktype::getStatus,Constants.ONE)
                    .set(DuWorktype::getCheckDate,update.getEditDate())
                    .set(DuWorktype::getCheckUserId,update.getCheckUserId())
                    .set(DuWorktype::getCheckInfo,update.getCheckInfo())
                    .eq(DuWorktype::getIsdeleted,Constants.ZERO)
                    .eq(DuWorktype::getStatus,Constants.ZERO)
                    .eq(DuWorktype::getDuSolutionId,s.getId()));

            if(worktypes == null || worktypes.size() ==0){
                throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该派遣单位方案存在方案是未设置工种信息信息，审核通过失败！");
            }


            for (DuWorktype w : worktypes) {
                DuWorktype nw = new DuWorktype();
                BeanUtils.copyProperties(w, nw);
@@ -166,40 +222,61 @@
    public Integer check(DispatchUnit param) {
        if(Objects.isNull(param)
                ||Objects.isNull(param.getId())
                ||param.getStatus() == null
                ||!(param.getStatus() ==Constants.ONE || param.getStatus() == Constants.TWO)){
                ||param.getUnitStatus() == null
                ||!(param.getUnitStatus() ==Constants.ONE || param.getUnitStatus() == Constants.TWO)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        DispatchUnit model = dispatchUnitMapper.selectById(param.getId());
        if(Objects.isNull(model) || Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO) ||!Constants.equalsInteger(model.getDataType(),Constants.ZERO)){
        if(Objects.isNull(model) || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO) ||!Constants.equalsInteger(model.getDataType(),Constants.ZERO)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到派遣单位信息");
        }
        if(Constants.equalsInteger(model.getStatus(),Constants.ZERO)){
        if(!Constants.equalsInteger(model.getUnitStatus(),Constants.ZERO)){
            throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，该派遣单位工种已审核，请勿重复提交~");
        }
        DispatchUnit update = new DispatchUnit();
        update.setEditor(user.getId());
        update.setEditDate(new Date());
        update.setId(model.getId());
        update.setStatus(param.getStatus());
        update.setWorktypeStatus(param.getWorktypeStatus());
        update.setUnitStatus(param.getUnitStatus());
        update.setWorktypeStatus(param.getUnitStatus());
        update.setCheckDate(update.getEditDate());
        update.setCheckUserId(user.getId());
        update.setCheckInfo(param.getCheckInfo());
        dispatchUnitMapper.updateById(update);
        if(Constants.equalsInteger(model.getStatus(),Constants.ONE)){
        DispatchUnit dispatchUnit = dispatchUnitMapper.selectById(param.getId());
        if(Constants.equalsInteger(param.getUnitStatus(),Constants.ONE)){
            //审核通过，修改状态，产生历史版本
            newVersionData(model,update);
            newVersionData(dispatchUnit,update);
            //存储操作历史
            this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.AUDIT_PASS,update.getCheckInfo());
        }else{
            //更新明细数据为审核失败
            duSolutionMapper.update(null,new UpdateWrapper<DuSolution>().lambda()
                    .set(DuSolution::getCheckDate,new Date() )
                    .set(DuSolution::getStatus,Constants.TWO)
                    .set(DuSolution::getCheckDate,new Date() )
                    .set(DuSolution::getCheckUserId,update.getCheckUserId())
                    .set(DuSolution::getCheckInfo,update.getCheckInfo())
                    .eq(DuSolution::getDispatchUnitId,update.getId()));

            duWorktypeMapper.update(null,new UpdateWrapper<DuWorktype>().lambda()
                    .set(DuWorktype::getStatus,Constants.TWO)
                    .set(DuWorktype::getCheckUserId,update.getCheckUserId())
                    .set(DuWorktype::getCheckInfo,update.getCheckInfo())
                    .set(DuWorktype::getCheckDate,new Date() )
                    .eq(DuWorktype::getIsdeleted,Constants.ZERO)
                    .eq(DuWorktype::getStatus,Constants.ZERO)
                    .eq(DuWorktype::getDispatchUnitId,update.getId()));
            //存储操作历史
            this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.AUDIT_UN_PASS,update.getCheckInfo());
        }

        //存储待办信息
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT;
        //删除其他待办
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,dispatchUnit.getId()));


        return  1;
    }
    @Override
@@ -247,11 +324,19 @@
        this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.UPLOAD,null);

        List<SaveDuSolutionDTO> saveDuSolutionDTOList = saveDispatchUnitDTO.getSaveDuSolutionDTOList();

        List<Integer> duSolutionIdS = saveDuSolutionDTOList.stream().map(m->m.getSolutionId()).collect(Collectors.toList());
        HashSet<Integer> setDuSolutionIdS=new HashSet<>(duSolutionIdS);
        if(duSolutionIdS.size()!=setDuSolutionIdS.size()){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"方案信息重复");
        }

        for (int i = 0; i < saveDuSolutionDTOList.size(); i++) {
            SaveDuSolutionDTO saveDuSolutionDTO = saveDuSolutionDTOList.get(i);
            DuSolution duSolution = new DuSolution();
            duSolution.setCreateDate(new Date());
            duSolution.setCreator(loginUserInfo.getId());
            duSolution.setStatus(Constants.ZERO);
            duSolution.setIsdeleted(Constants.ZERO);
            duSolution.setDispatchUnitId(dispatchUnit.getId());
            duSolution.setSortnum(i);
@@ -259,6 +344,13 @@
            duSolutionMapper.insert(duSolution);

            List<SaveDuWorkTypeDTO> saveDuWorkTypeDTOList = saveDuSolutionDTO.getSaveDuWorkTypeDTOList();

            List<Integer> duWorkTypeIdS = saveDuWorkTypeDTOList.stream().map(m->m.getWorkTypeId()).collect(Collectors.toList());
            HashSet<Integer> setDuWorkTypeIdS=new HashSet<>(duWorkTypeIdS);
            if(duWorkTypeIdS.size()!=setDuWorkTypeIdS.size()){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"【"+saveDuSolutionDTO.getSolutionName()+"】该方案下存在重复工种！");
            }

            if(!CollectionUtils.isNotEmpty(saveDuSolutionDTOList)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"【"+saveDuSolutionDTO.getSolutionName()+"】该方案下未选择工种！");
            }
@@ -269,13 +361,25 @@
                duWorktype.setCreator(loginUserInfo.getId());
                duWorktype.setIsdeleted(Constants.ZERO);
                duWorktype.setDuSolutionId(duSolution.getId());
                duWorktype.setStatus(Constants.ZERO);
                duWorktype.setSortnum(j);
                duWorktype.setDispatchUnitId(dispatchUnit.getId());
                duWorktype.setWorkTypeId(saveDuWorkTypeDTO.getWorkTypeId());
                duWorktype.setVideoUrl(saveDuWorkTypeDTO.getVideoUrl());
                duWorktype.setStatus2(Constants.ZERO);
                duWorktypeMapper.insert(duWorktype);
            }
        }


        //存储待办信息
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT;
        //删除其他待办
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,dispatchUnit.getId()));
        Notices notices = new Notices(noticeObjectType,Constants.ZERO,dispatchUnit.getId(),dispatchUnit.getName(),
                dispatchUnit.getCompanyId(), Constants.NoticeType.ZERO);
        noticesMapper.insert(notices);

        return dispatchUnit.getId();
    }

@@ -285,7 +389,6 @@
    public Integer editDispatchUnit(SaveDispatchUnitDTO saveDispatchUnitDTO) {
        if(Objects.isNull(saveDispatchUnitDTO)
                ||Objects.isNull(saveDispatchUnitDTO.getId())
                || CollectionUtils.isEmpty(saveDispatchUnitDTO.getSaveDuSolutionDTOList())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
@@ -314,7 +417,6 @@
        dispatchUnit.setContent(saveDispatchUnitDTO.getContent());
        dispatchUnit.setName(saveDispatchUnitDTO.getName());
        dispatchUnit.setUnitStatus(Constants.ZERO);
        dispatchUnit.setWorktypeStatus(Constants.ZERO);
        dispatchUnit.setEditDate(new Date());
        dispatchUnit.setEditor(loginUserInfo.getId());
        dispatchUnitMapper.updateById(dispatchUnit);
@@ -322,7 +424,16 @@
        //存储操作记录
        this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.EDIT_UNIT,null);

        this.dealDuData(saveDispatchUnitDTO,loginUserInfo);
//        this.dealDuData(saveDispatchUnitDTO,loginUserInfo);


        //存储待办信息
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT;
        //删除其他待办
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,dispatchUnit.getId()));
        Notices notices = new Notices(noticeObjectType,Constants.ZERO,dispatchUnit.getId(),dispatchUnit.getName(),
                dispatchUnit.getCompanyId(), Constants.NoticeType.ZERO);
        noticesMapper.insert(notices);

        return dispatchUnit.getId();
    }
@@ -338,7 +449,7 @@
    public Integer createSolution(SaveDispatchUnitDTO saveDispatchUnitDTO) {
        if(Objects.isNull(saveDispatchUnitDTO)
                ||Objects.isNull(saveDispatchUnitDTO.getId())
                || CollectionUtils.isEmpty(saveDispatchUnitDTO.getSaveDuSolutionDTOList())
                || !CollectionUtils.isNotEmpty(saveDispatchUnitDTO.getSaveDuSolutionDTOList())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
@@ -355,6 +466,15 @@
        //存储操作历史
        this.saveDuLog(dispatchUnit,Constants.DispatchUnitLogType.ADD_WORK_TYPE,null);
        this.dealDuData(saveDispatchUnitDTO,loginUserInfo);

        //存储待办信息
        Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.DISPATCH_UNIT;
        //删除其他待办
        noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,dispatchUnit.getId()));
        Notices notices = new Notices(noticeObjectType,Constants.ZERO,dispatchUnit.getId(),dispatchUnit.getName(),
                dispatchUnit.getCompanyId(), Constants.NoticeType.ONE);
        noticesMapper.insert(notices);

        return dispatchUnit.getId();
    }

@@ -363,7 +483,10 @@
        List<SaveDuSolutionDTO> saveDuSolutionDTOList = saveDispatchUnitDTO.getSaveDuSolutionDTOList();
        for (int i = 0; i < saveDuSolutionDTOList.size(); i++) {
            SaveDuSolutionDTO saveDuSolutionDTO = saveDuSolutionDTOList.get(i);
            DuSolution duSolution = duSolutionMapper.selectOne(new QueryWrapper<DuSolution>().lambda().eq(DuSolution::getDispatchUnitId,saveDuSolutionDTO.getId())
            if(Objects.isNull(saveDuSolutionDTO.getSolutionId())){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"【"+saveDuSolutionDTO.getSolutionName()+"】该方案下选择方案信息异常！");
            }
            DuSolution duSolution = duSolutionMapper.selectOne(new QueryWrapper<DuSolution>().lambda().eq(DuSolution::getDispatchUnitId,saveDispatchUnitDTO.getId())
                    .eq(DuSolution::getIsdeleted,Constants.ZERO)
                    .eq(DuSolution::getSolutionId,saveDuSolutionDTO.getSolutionId()).last("limit 1"));
            Integer duSolutionNum = duSolutionMapper.selectCount(new QueryWrapper<DuSolution>().lambda().eq(DuSolution::getDispatchUnitId,saveDuSolutionDTO.getId()));
@@ -372,6 +495,7 @@
                duSolution.setCreateDate(new Date());
                duSolution.setCreator(loginUserInfo.getId());
                duSolution.setIsdeleted(Constants.ZERO);
                duSolution.setStatus(Constants.ZERO);
                duSolution.setDispatchUnitId(saveDispatchUnitDTO.getId());
                duSolution.setSortnum(duSolutionNum + i);
                duSolution.setSolutionId(saveDuSolutionDTO.getSolutionId());
@@ -383,10 +507,14 @@
            }
            for (int j = 0; j < saveDuWorkTypeDTOList.size(); j++) {
                SaveDuWorkTypeDTO saveDuWorkTypeDTO = saveDuWorkTypeDTOList.get(j);
                if(duWorktypeMapper.selectCount(new QueryWrapper<DuWorktype>().lambda().eq(DuWorktype::getDuSolutionId,duSolution.getId())
                if(Objects.isNull(saveDuWorkTypeDTO.getWorkTypeId())){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"【"+saveDuSolutionDTO.getSolutionName()+"】该方案下"+saveDuWorkTypeDTO.getWorkTypeName()+"该工种信息异常");
                }
                if(duWorktypeMapper.selectCount(new QueryWrapper<DuWorktype>()
                        .lambda().eq(DuWorktype::getDuSolutionId,duSolution.getId())
                        .eq(DuWorktype::getIsdeleted,Constants.ZERO)
                        .eq(DuWorktype::getWorkTypeId,saveDuWorkTypeDTO.getWorkTypeId()))>0){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"【"+saveDuSolutionDTO.getSolutionName()+"】该方案下"+saveDuWorkTypeDTO.getWorkTypeName()+"该工种已存在工种已存在");
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"【"+saveDuSolutionDTO.getSolutionName()+"】该方案下"+saveDuWorkTypeDTO.getWorkTypeName()+"该工种已存在");
                }
                Integer duWorkTypeNum = duWorktypeMapper.selectCount(new QueryWrapper<DuWorktype>().lambda().eq(DuWorktype::getDuSolutionId,duSolution.getId()));
                DuWorktype duWorktype = new DuWorktype();
@@ -394,7 +522,9 @@
                duWorktype.setCreator(loginUserInfo.getId());
                duWorktype.setIsdeleted(Constants.ZERO);
                duWorktype.setDuSolutionId(duSolution.getId());
                duWorktype.setStatus(Constants.ZERO);
                duWorktype.setSortnum(duWorkTypeNum + j);
                duWorktype.setDispatchUnitId(saveDispatchUnitDTO.getId());
                duWorktype.setWorkTypeId(saveDuWorkTypeDTO.getWorkTypeId());
                duWorktype.setVideoUrl(saveDuWorkTypeDTO.getVideoUrl());
                duWorktype.setStatus2(Constants.ZERO);
@@ -425,7 +555,7 @@
        if(Objects.isNull(dispatchUnit)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未查询到派遣单位信息");
        }
        //派遣单位审批
        //派遣单位审核
        if(dispatchUnitAuditDTO.getAuditType().equals(Constants.ZERO)){
            if(dispatchUnit.getStatus().equals(Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"派遣单位信息已审核");
@@ -587,77 +717,98 @@
        QueryWrapper<DispatchUnit> wrapper = new QueryWrapper<>(dispatchUnit);
        return dispatchUnitMapper.selectList(wrapper);
    }
  


    @Override
    public PageData<DispatchUnit> findPage(PageWrap<DispatchUnit> pageWrap) {
        IPage<DispatchUnit> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<DispatchUnit> queryWrapper = new QueryWrapper<>();
        if(pageWrap.getModel().getDataType() ==null){
            pageWrap.getModel().setDataType(Constants.ZERO);
        }

        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Utils.MP.blankToNull(pageWrap.getModel());
        MPJLambdaWrapper<DispatchUnit>  queryWrapper =    new MPJLambdaWrapper<DispatchUnit>();
        queryWrapper.selectAll(DispatchUnit.class)
                .selectAs(Company::getName,DispatchUnit::getCompanyName)
                .leftJoin(Company.class,Company::getId,DispatchUnit::getCompanyId);
        queryWrapper.eq(DispatchUnit::getIsdeleted,Constants.ZERO);
        if(Constants.equalsInteger(user.getType(),Constants.ZERO)){
            //只能看权限范围内
            if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
                queryWrapper. eq(Company::getId,-1);//设置无效访问
            }else {
                queryWrapper. in(Company::getId, user.getCompanyIdList());
            }
        } else  {
            //企业用户只看自己的数据
            pageWrap.getModel().setCompanyId(user.getCompanyId());
        }
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getId, pageWrap.getModel().getId());
            queryWrapper.eq(DispatchUnit::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getCreator, pageWrap.getModel().getCreator());
            queryWrapper.eq(DispatchUnit::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(DispatchUnit::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(DispatchUnit::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
            queryWrapper.ge(DispatchUnit::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.le(DispatchUnit::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getEditor, pageWrap.getModel().getEditor());
            queryWrapper.eq(DispatchUnit::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(DispatchUnit::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(DispatchUnit::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
            queryWrapper.ge(DispatchUnit::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.le(DispatchUnit::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getIsdeleted, pageWrap.getModel().getIsdeleted());
            queryWrapper.eq(DispatchUnit::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getName, pageWrap.getModel().getName());
            queryWrapper.like(DispatchUnit::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getRemark, pageWrap.getModel().getRemark());
            queryWrapper.eq(DispatchUnit::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getStatus() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getStatus, pageWrap.getModel().getStatus());
            queryWrapper.eq(DispatchUnit::getStatus, pageWrap.getModel().getStatus());
        }
        if (pageWrap.getModel().getUnitStatus() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getUnitStatus, pageWrap.getModel().getUnitStatus());
            queryWrapper.eq(DispatchUnit::getUnitStatus, pageWrap.getModel().getUnitStatus());
        }
        if (pageWrap.getModel().getWorktypeStatus() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getWorktypeStatus, pageWrap.getModel().getWorktypeStatus());
            queryWrapper.eq(DispatchUnit::getWorktypeStatus, pageWrap.getModel().getWorktypeStatus());
        }
        if (pageWrap.getModel().getSortnum() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getSortnum, pageWrap.getModel().getSortnum());
            queryWrapper.eq(DispatchUnit::getSortnum, pageWrap.getModel().getSortnum());
        }
        if (pageWrap.getModel().getCompanyId() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getCompanyId, pageWrap.getModel().getCompanyId());
            queryWrapper.eq(DispatchUnit::getCompanyId, pageWrap.getModel().getCompanyId());
        }
        if (pageWrap.getModel().getPhone() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getPhone, pageWrap.getModel().getPhone());
            queryWrapper.eq(DispatchUnit::getPhone, pageWrap.getModel().getPhone());
        }
        if (pageWrap.getModel().getLinkname() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getLinkname, pageWrap.getModel().getLinkname());
            queryWrapper.eq(DispatchUnit::getLinkname, pageWrap.getModel().getLinkname());
        }
        if (pageWrap.getModel().getCheckDate() != null) {
            queryWrapper.lambda().ge(DispatchUnit::getCheckDate, Utils.Date.getStart(pageWrap.getModel().getCheckDate()));
            queryWrapper.lambda().le(DispatchUnit::getCheckDate, Utils.Date.getEnd(pageWrap.getModel().getCheckDate()));
            queryWrapper.ge(DispatchUnit::getCheckDate, Utils.Date.getStart(pageWrap.getModel().getCheckDate()));
            queryWrapper.le(DispatchUnit::getCheckDate, Utils.Date.getEnd(pageWrap.getModel().getCheckDate()));
        }
        if (pageWrap.getModel().getCheckInfo() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getCheckInfo, pageWrap.getModel().getCheckInfo());
            queryWrapper.eq(DispatchUnit::getCheckInfo, pageWrap.getModel().getCheckInfo());
        }
        if (pageWrap.getModel().getCheckUserId() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getCheckUserId, pageWrap.getModel().getCheckUserId());
            queryWrapper.eq(DispatchUnit::getCheckUserId, pageWrap.getModel().getCheckUserId());
        }
        if (pageWrap.getModel().getVersion() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getVersion, pageWrap.getModel().getVersion());
            queryWrapper.eq(DispatchUnit::getVersion, pageWrap.getModel().getVersion());
        }
        if (pageWrap.getModel().getDataType() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getDataType, pageWrap.getModel().getDataType());
            queryWrapper.eq(DispatchUnit::getDataType, pageWrap.getModel().getDataType());
        }
        if (pageWrap.getModel().getBaseId() != null) {
            queryWrapper.lambda().eq(DispatchUnit::getBaseId, pageWrap.getModel().getBaseId());
            queryWrapper.eq(DispatchUnit::getBaseId, pageWrap.getModel().getBaseId());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -666,7 +817,8 @@
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(dispatchUnitMapper.selectPage(page, queryWrapper));
        PageData<DispatchUnit> pageData = PageData.from(dispatchUnitJoinMapper.selectJoinPage(page,DispatchUnit.class, queryWrapper));
        return pageData;
    }

    @Override
@@ -678,14 +830,19 @@

    @Override
    public DispatchUnit detailById(Integer id) {
        DispatchUnit dispatchUnit = dispatchUnitMapper.selectById(id);
        DispatchUnit dispatchUnit = dispatchUnitJoinMapper.selectJoinOne(DispatchUnit.class,
                new MPJLambdaWrapper<DispatchUnit>()
                        .selectAll(DispatchUnit.class)
                        .selectAs(Company::getName,DispatchUnit::getCompanyName)
                        .leftJoin(Company.class,Company::getId,DispatchUnit::getCompanyId)
                        .eq(DispatchUnit::getId,id) );
        //方案配置表
        List<DuSolution> duSolutionList = duSolutionJoinMapper.selectJoinList(DuSolution.class,
                new MPJLambdaWrapper<DuSolution>()
                        .selectAll(DuSolution.class)
                        .selectAs(Solutions::getName,DuSolution::getSolutionName)
                        .leftJoin(Solutions.class,Solutions::getId,DuSolution::getSolutionId)
                        .eq(DuSolution::getSolutionId,dispatchUnit.getId())
                        .eq(DuSolution::getDispatchUnitId,dispatchUnit.getId())
                        .orderByAsc(DuSolution::getSortnum)
        );
        if(CollectionUtils.isNotEmpty(duSolutionList)){
@@ -698,6 +855,14 @@
                                .leftJoin(Worktype.class,Worktype::getId,DuWorktype::getWorkTypeId)
                                .eq(DuWorktype::getDuSolutionId,duSolution.getId())
                );
                if(CollectionUtils.isNotEmpty(duWorkTypeList)){
                    String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.DU_FILE).getCode();
                    duWorkTypeList.forEach(i->{
                        if(StringUtils.isNotBlank(i.getVideoUrl())){
                            i.setVideoUrlFull(path + i.getVideoUrl());
                        }
                    });
                }
                duSolution.setDuWorktypeList(duWorkTypeList);
            }
            dispatchUnit.setDuSolutionList(duSolutionList);
@@ -706,10 +871,11 @@
        List<DuLog> duLogList = duLogJoinMapper.selectJoinList(DuLog.class,
                new MPJLambdaWrapper<DuLog>()
                        .selectAll(DuLog.class)
                        .selectAs(Member::getName,DuLog::getCreatorName)
                        .selectAs(SystemUser::getType,DuLog::getCreatorType)
                        .selectAs(SystemUser::getRealname,DuLog::getCreatorName)
                        .selectAs(Company::getName,DuLog::getCompanyName)
                        .leftJoin(Member.class,Member::getId,DuLog::getCreator)
                        .leftJoin(Company.class,Company::getId,Member::getCompanyId)
                        .leftJoin(SystemUser.class,SystemUser::getId,DuLog::getCreator)
                        .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                        .eq(DuLog::getDuId,dispatchUnit.getId())
                        .orderByAsc(DuLog::getCreateDate)
        );
@@ -725,17 +891,23 @@
    @Override
    public List<DispatchUnit> findByDTO(DispatchUnitQueryDTO dispatchUnitQueryDTO) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        List<DispatchUnit> dispatchUnitList = dispatchUnitMapper.selectList(new QueryWrapper<DispatchUnit>().lambda()
                .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
                .eq(loginUserInfo.getType().equals(Constants.ONE),DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
                .eq(DispatchUnit::getStatus,Constants.ZERO)
                .eq(DispatchUnit::getDataType,dispatchUnitQueryDTO.getDataType())
                .apply(!Objects.isNull(dispatchUnitQueryDTO.getSolutionId()), " id in ( select d.dispatch_unit_id from du_solution d where d.solutionId = "+dispatchUnitQueryDTO.getSolutionId()+"  ) " )
                .exists(!Objects.isNull(dispatchUnitQueryDTO.getApplyId()),
                        " select 1 from apply_detail ad where ad.isdeleted = 0 and ad.apply_id = "+dispatchUnitQueryDTO.getApplyId()+" " +
                                " ad.du_id = t.id ")
                .orderByAsc(DispatchUnit::getSortnum)
        List<DispatchUnit> dispatchUnitList  = dispatchUnitJoinMapper.selectJoinList(DispatchUnit.class,
                new MPJLambdaWrapper<DispatchUnit>().selectAll(DispatchUnit.class)
//                        .selectAs(DuSolution::getId,DispatchUnit::getDuSolutionId)
//                        .leftJoin(DuSolution.class,DuSolution::getDispatchUnitId,DispatchUnit::getId)
                        .eq(DispatchUnit::getIsdeleted,Constants.ZERO)
                        .select("(select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and b.solution_id="+dispatchUnitQueryDTO.getSolutionId()+" limit 1) as du_solution_id" )
                        .eq(loginUserInfo.getType().equals(Constants.ONE),DispatchUnit::getCompanyId,loginUserInfo.getCompanyId())
                        .eq(DispatchUnit::getStatus,Constants.ZERO)
                        //.eq(DispatchUnit::getDataType,dispatchUnitQueryDTO.getDataType())
                        .eq(DispatchUnit::getDataType,Constants.TWO)
                        .exists("select b.id from du_solution b where b.isdeleted=0 and b.dispatch_unit_id=t.id and  b.solution_id="+dispatchUnitQueryDTO.getSolutionId() )
//                        .eq(!Objects.isNull(dispatchUnitQueryDTO.getSolutionId()),DuSolution::getSolutionId,dispatchUnitQueryDTO.getSolutionId())
                        .exists(!Objects.isNull(dispatchUnitQueryDTO.getApplyId()),
                                " select 1 from apply_detail ad where ad.isdeleted = 0 and ad.apply_id = "+dispatchUnitQueryDTO.getApplyId()+" " +
                                        " and ad.du_id = t.id ")
        );

        return dispatchUnitList;
    }