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

设计出图优化

Browse Source
This commit is contained in:
dfdg
2025-09-28 16:57:24 +08:00
parent d644df94dc
commit c66d5f0789
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java
View File

@ -134,4 +134,9 @@ public class DesVolumeCatalogVo implements Serializable {
*/ */
private Long fileCount; private Long fileCount;
/**
* 待提交审核数量
*/
private Long reviewCount;
} }

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

@ -252,14 +252,15 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
// 判断是否重名 // 判断是否重名
Long count = this.lambdaQuery() Long count = this.lambdaQuery()
.eq(DesVolumeCatalog::getProjectId, oldVolumeCatalog.getProjectId()) .eq(DesVolumeCatalog::getProjectId, oldVolumeCatalog.getProjectId())
.and(lqw -> lqw
.eq(DesVolumeCatalog::getVolumeNumber, req.getVolumeNumber()) .eq(DesVolumeCatalog::getVolumeNumber, req.getVolumeNumber())
.or() // .and(lqw -> lqw
.eq(DesVolumeCatalog::getDocumentName, req.getDocumentName())) // .eq(DesVolumeCatalog::getVolumeNumber, req.getVolumeNumber())
// .or()
// .eq(DesVolumeCatalog::getDocumentName, req.getDocumentName()))
.ne(DesVolumeCatalog::getDesign, req.getDesign()) .ne(DesVolumeCatalog::getDesign, req.getDesign())
.count(); .count();
if (count > 0) { if (count > 0) {
throw new ServiceException("卷册目录已存在", HttpStatus.BAD_REQUEST); throw new ServiceException("卷册号已存在", HttpStatus.BAD_REQUEST);
} }
// 修改数据 // 修改数据
DesVolumeCatalog volumeCatalog = new DesVolumeCatalog(); DesVolumeCatalog volumeCatalog = new DesVolumeCatalog();
@ -390,6 +391,13 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl<DesVolumeCatalogMap
fileQueryWrapper.eq(DesVolumeFile::getVolumeCatalogId, desVolumeCatalogVo.getDesign()); fileQueryWrapper.eq(DesVolumeFile::getVolumeCatalogId, desVolumeCatalogVo.getDesign());
List<DesVolumeFile> list = volumeFileService.list(fileQueryWrapper); List<DesVolumeFile> list = volumeFileService.list(fileQueryWrapper);
if (list != null && !list.isEmpty()) { if (list != null && !list.isEmpty()) {
long count = 0;
for (DesVolumeFile file : list) {
if (BusinessStatusEnum.DRAFT.getStatus().equals(file.getAuditStatus())) {
count++;
}
}
desVolumeCatalogVo.setReviewCount(count);
desVolumeCatalogVo.setFileCount((long) list.size()); desVolumeCatalogVo.setFileCount((long) list.size());
} else { } else {
desVolumeCatalogVo.setFileCount(0L); desVolumeCatalogVo.setFileCount(0L);