From afae2409d65e0c044b8119b3fd8f57e438c18a08 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 09 十一月 2025 21:29:24 +0800
Subject: [PATCH] 修改了大量的代码块
---
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
index 00f2aef..c98e310 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -11,10 +11,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ArchiveCategory;
import com.ruoyi.domain.DocumentMaterials;
-import com.ruoyi.domain.vo.DocumentMaterialFileSmallVo;
-import com.ruoyi.domain.vo.DocumentMaterialFileStyle;
-import com.ruoyi.domain.vo.DocumentMaterialsVo;
-import com.ruoyi.domain.vo.DocumentMaterialsVoLarge;
+import com.ruoyi.domain.vo.*;
import com.ruoyi.mapper.DocumentMaterialsMapper;
import com.ruoyi.service.IDocumentMaterialsService;
import com.ruoyi.util.ErrorcodeExceptionextends;
@@ -44,8 +41,10 @@
.like(!StringUtils.isEmpty(documentMaterials.getRetentionPeriod()), DocumentMaterials::getRetentionPeriod, documentMaterials.getRetentionPeriod())
.like(!StringUtils.isEmpty(documentMaterials.getSecurityLevel()), DocumentMaterials::getSecurityLevel, documentMaterials.getSecurityLevel())
.eq(documentMaterials.getDate()!=null, DocumentMaterials::getDate, documentMaterials.getDate())
- .eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId());
-// .like(!StringUtils.isEmpty(archiveRecords.getFilingNumber()), ArchiveRecords::getFilingNumber, archiveRecords.getFilingNumber())
+ .eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId())
+ .eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
+
+ // .like(!StringUtils.isEmpty(archiveRecords.getFilingNumber()), ArchiveRecords::getFilingNumber, archiveRecords.getFilingNumber())
// .like(!StringUtils.isEmpty(archiveRecords.getArchiveRoomNumber()), ArchiveRecords::getArchiveRoomNumber, archiveRecords.getArchiveRoomNumber())
// .like(!StringUtils.isEmpty(archiveRecords.getRecordId()), ArchiveRecords::getRecordId, archiveRecords.getRecordId());
// // .like(!StringUtils.isEmpty(zfProperty.getLocation()), ZfProperty::getLocation, zfProperty.getLocation())
@@ -118,6 +117,11 @@
}
@Override
+ public List<DocumentMaterialsFileList> selectDocumentMaterialsFileList(Long id) {
+ return this.baseMapper.getDocumentMaterialsFileList(Math.toIntExact(id));
+ }
+
+ @Override
public int insertDocumentMaterials(DocumentMaterials documentMaterials) {
LocalDateTime time = LocalDateTime.now();
@@ -168,12 +172,12 @@
}
@Override
- public Long getFiNum(Long pageNumber) {
- return this.baseMapper.getFileNumber(pageNumber);
+ public Long getFiNum(Long pageNumber, Long recordId) {
+ return this.baseMapper.getFileNumber(pageNumber, recordId);
}
@Override
- public int updateByPageNumber(Long pageNumber, String sizeType, Long fileNumber, int width, int height, int horizontalResolution, int verticalResolution, double fileSize, String url, String format) {
+ public int updateByPageNumber(Long pageNumber, String sizeType, Long fileNumber, int width, int height, int horizontalResolution, int verticalResolution, double fileSize, String url, String format, Long recordId) {
//鏍规嵁pageNumber鎷垮埌title锛岀劧鍚庤绠梡ageOrder
LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
lqw.eq(pageNumber!=null, DocumentMaterials::getPageNumber, pageNumber);
@@ -183,12 +187,12 @@
if(pageNumber.equals(1))
pageOrder = 1L;
else {
- Long maxPOrder = this.baseMapper.getMaxPageOrder(records.get(0).getTitle(), pageNumber, records.get(0).getStage());
+ Long maxPOrder = this.baseMapper.getMaxPageOrder(records.get(0).getTitle(), pageNumber, records.get(0).getStage(), recordId);
if (maxPOrder != null)
pageOrder = maxPOrder + 1;
}
- this.baseMapper.updateInfoByPageNumber(pageNumber, sizeType,fileNumber,pageOrder, width, height, horizontalResolution, verticalResolution, fileSize, url,format);
+ this.baseMapper.updateInfoByPageNumber(pageNumber, sizeType,fileNumber,pageOrder, width, height, horizontalResolution, verticalResolution, fileSize, url,format, recordId);
return 0;
}
@@ -224,4 +228,16 @@
}
return AjaxResult.success(); }
+
+ @Override
+ public DocumentMaterials selectByPageNumber(Long pageNumber, Integer recordId) {
+ LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(pageNumber!=null, DocumentMaterials::getPageNumber, pageNumber);
+ lqw.eq(recordId!=null, DocumentMaterials::getRecordId, recordId);
+ List<DocumentMaterials> ls = list(lqw);
+ if(!ls.isEmpty())
+ return ls.get(0);
+ else
+ return null;
+ }
}
--
Gitblit v1.9.1