diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java index fca98874..1ddda84e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/domain/vo/volumecatalog/DesVolumeCatalogVo.java @@ -134,4 +134,9 @@ public class DesVolumeCatalogVo implements Serializable { */ private Long fileCount; + /** + * 待提交审核数量 + */ + private Long reviewCount; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java index 9996b7cd..f1a03153 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/service/impl/DesVolumeCatalogServiceImpl.java @@ -252,14 +252,15 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl lqw - .eq(DesVolumeCatalog::getVolumeNumber, req.getVolumeNumber()) - .or() - .eq(DesVolumeCatalog::getDocumentName, req.getDocumentName())) + .eq(DesVolumeCatalog::getVolumeNumber, req.getVolumeNumber()) +// .and(lqw -> lqw +// .eq(DesVolumeCatalog::getVolumeNumber, req.getVolumeNumber()) +// .or() +// .eq(DesVolumeCatalog::getDocumentName, req.getDocumentName())) .ne(DesVolumeCatalog::getDesign, req.getDesign()) .count(); if (count > 0) { - throw new ServiceException("卷册目录已存在", HttpStatus.BAD_REQUEST); + throw new ServiceException("卷册号已存在", HttpStatus.BAD_REQUEST); } // 修改数据 DesVolumeCatalog volumeCatalog = new DesVolumeCatalog(); @@ -390,6 +391,13 @@ public class DesVolumeCatalogServiceImpl extends ServiceImpl list = volumeFileService.list(fileQueryWrapper); 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()); } else { desVolumeCatalogVo.setFileCount(0L);