阜宁运维项目
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
MrShi
2025-01-14 8466d217aba3abd273a7a1dd8fa6093615272a2d 
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwMaterialServiceImpl.java


@@ -59,7 +59,6 @@


        //TODO rk 所属项目/房间需求问题


        if(Objects.isNull(ywMaterial)


            || StringUtils.isBlank(ywMaterial.getName())


                || StringUtils.isBlank(ywMaterial.getCode())


                || StringUtils.isBlank(ywMaterial.getQrcode())


                || Objects.isNull(ywMaterial.getCateId())


        ){


@@ -190,7 +189,7 @@


        Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,id).eq(Multifile::getObjType,Constants.MultiFile.MATERIAL_FILE.getKey()));


        if(Objects.nonNull(multifile)){


            String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()


                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_CONTRACT_BILL).getCode();


                    +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_MATERIAL).getCode();


            multifile.setFileurlFull(path + multifile.getFileurl());


            ywMaterial.setMultifile(multifile);


        }


@@ -221,11 +220,22 @@


                .like(StringUtils.isNotBlank(model.getAttr()),YwMaterial::getAttr,model.getAttr())


                .eq(Objects.nonNull(model.getProjectId()),YwRoom::getProjectId,model.getProjectId())


                .eq(Objects.nonNull(model.getRoomId()),YwMaterial::getRoomId,model.getRoomId())


                .eq(Objects.nonNull(model.getFloorId()),YwRoom::getFloor,model.getFloorId())


                .eq(Objects.nonNull(model.getBuildingId()),YwRoom::getBuildingId,model.getBuildingId())


                .eq(YwMaterial::getIsdeleted,Constants.ZERO)


                .orderByAsc(YwMaterial::getCode)


        ;




        IPage iPage = ywMaterialMapper.selectJoinPage(page,YwMaterial.class,queryWrapper);


        IPage<YwMaterial> iPage = ywMaterialMapper.selectJoinPage(page,YwMaterial.class,queryWrapper);


        String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()


                +systemDictDataBiz.queryByCode(Constants.FTP,Constants.YW_MATERIAL).getCode();


        for (YwMaterial ywMaterial:iPage.getRecords()) {


            Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,ywMaterial.getId()).eq(Multifile::getObjType,Constants.MultiFile.MATERIAL_FILE.getKey()));


            if(Objects.nonNull(multifile)){


                multifile.setFileurlFull(path + multifile.getFileurl());


                ywMaterial.setMultifile(multifile);


            }


        }


        return PageData.from(iPage);


    }