最新版本541200007

jiangping

2024-10-30 67a4d4128fe6e4101d34e92689c8e3284ef4dbd4

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

@@ -59,12 +59,16 @@
        }
        if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
            //如果是区域配置
            if(model.getCompanyId() == null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请选择责任部门！");
            }
            List<Integer> ids = model.getMemberIdList();
            if(ids==null || ids.size() ==0){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，安全员信息不正确，请按要求填写内容！");
            }
           List<Member>  memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
                    .eq(Member::getType,Constants.TWO)
                    .eq(Member::getCompanyId,model.getCompanyId())
                    .in(Member::getId,ids)
                    .eq(Member::getIsdeleted,Constants.ZERO));
            if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
@@ -142,12 +146,16 @@
        }
        if(Constants.equalsInteger(hiddenDangerParam.getType(),Constants.ZERO)){
            //如果是区域配置,校验安全员信息是否正确
            if(model.getCompanyId() == null){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请选择责任部门！");
            }
            List<Integer> ids =model.getMemberIdList();
            if(ids==null || ids.size() ==0){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，安全员信息不正确，请按要求填写内容！");
            }
            List<Member>  memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
                    .eq(Member::getType,Constants.TWO)
                    .eq(Member::getCompanyId,model.getCompanyId())
                    .in(Member::getId,ids)
                    .eq(Member::getIsdeleted,Constants.ZERO));
            if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
@@ -208,10 +216,12 @@
    @Override
    public PageData<HiddenDangerParam> findPage(PageWrap<HiddenDangerParam> pageWrap) {
        IPage<HiddenDangerParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<HiddenDangerParam> queryWrapper = new QueryWrapper<>();
        MPJLambdaWrapper<HiddenDangerParam> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        queryWrapper.lambda()
        queryWrapper. selectAll(HiddenDangerParam.class)
                .selectAs(Company::getCompanyNamePath,HiddenDangerParam::getCompanyName)
                .leftJoin(Company.class,Company::getId,HiddenDangerParam::getCompanyId)
                .eq(pageWrap.getModel().getId() != null, HiddenDangerParam::getId, pageWrap.getModel().getId())
                .eq(pageWrap.getModel().getCreator() != null, HiddenDangerParam::getCreator, pageWrap.getModel().getCreator())
                .eq(pageWrap.getModel().getEditor() != null, HiddenDangerParam::getEditor, pageWrap.getModel().getEditor())
@@ -235,7 +245,7 @@
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        PageData<HiddenDangerParam> result = PageData.from(hiddenDangerParamMapper.selectPage(page, queryWrapper));
        PageData<HiddenDangerParam> result = PageData.from(hiddenDangerParamMapper.selectJoinPage(page,HiddenDangerParam.class, queryWrapper));

        return result;
    }