lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

版本号

Browse Source
This commit is contained in:
zt
2025-09-04 20:26:56 +08:00
parent 8e9b7c9b14
commit 490820d080
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesDesignChangeServiceImpl.java
View File

@ -649,7 +649,8 @@ public class DesDesignChangeServiceImpl extends ServiceImpl<DesDesignChangeMappe
//查询蓝图最大版本号
List<DesVolumeFile> list = volumeFileService.list(Wrappers.lambdaQuery(DesVolumeFile.class)
.eq(DesVolumeFile::getType, DesVolumeFile.BLUEPRINT)
.in(DesVolumeFile::getType, Arrays.asList(DesVolumeFile.BLUEPRINT, DesVolumeFile.WASTE))
.eq(DesVolumeFile::getVolumeCatalogId, volumeCatalog.getDesign())
.orderByDesc(DesVolumeFile::getVersion)
);
String version = "1.0";

7
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeFileServiceImpl.java
View File

@ -309,9 +309,10 @@ public class DesVolumeFileServiceImpl extends ServiceImpl<DesVolumeFileMapper, D
// 根据文件类型和文件名判断是否存在文件，存在则版本号往上增
List<DesVolumeFile> existingFiles = baseMapper.selectList(new LambdaQueryWrapper<DesVolumeFile>()
.eq(DesVolumeFile::getType, type)
.eq(DesVolumeFile.PROCESS.equals(type),DesVolumeFile::getType, type)
.in(DesVolumeFile.BLUEPRINT.equals(type),DesVolumeFile::getType, Arrays.asList(DesVolumeFile.BLUEPRINT, DesVolumeFile.WASTE))
.eq(DesVolumeFile::getVolumeCatalogId, file.getVolumeCatalogId())
.eq(DesVolumeFile::getFileName, fileName)
// .eq(DesVolumeFile::getFileName, fileName)
.orderByDesc(DesVolumeFile::getVersion));
String versionStr = "1.0"; // 默认版本号
@ -327,7 +328,7 @@ public class DesVolumeFileServiceImpl extends ServiceImpl<DesVolumeFileMapper, D
// 过程图纸：基于蓝图版本号，如蓝图是1.0，则过程图为1.1, 1.2...1.9, 1.10
// 先查找对应的蓝图文件最新版本
List<DesVolumeFile> blueprintFiles = baseMapper.selectList(new LambdaQueryWrapper<DesVolumeFile>()
.eq(DesVolumeFile::getType, DesVolumeFile.BLUEPRINT) // 蓝图类型
.in(DesVolumeFile::getType, Arrays.asList(DesVolumeFile.BLUEPRINT, DesVolumeFile.WASTE)) // 蓝图类型
.eq(DesVolumeFile::getVolumeCatalogId, file.getVolumeCatalogId())
// .eq(DesVolumeFile::getFileName, fileName)
.orderByDesc(DesVolumeFile::getVersion));