From 131cd265f4711691fe22ff50c44f523c65cd7022 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 17 十一月 2025 11:49:52 +0800
Subject: [PATCH] 修改了对应代码
---
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 95 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 10 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 183d7c5..800b22a 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();
@@ -145,8 +149,64 @@
@Override
public int updateDocumentMaterials(DocumentMaterials documentMaterials) {
+ boolean result = false;
+ try {
- boolean result = updateById(documentMaterials);
+ //淇敼椤靛彿鎴愬姛涔嬪悗锛岃閲嶆柊鐢熸垚鏂囦欢鏉愭枡搴忓彿锛岄〉娆�
+ //鏍规嵁pageNumber鎷垮埌title锛岀劧鍚庤绠梡ageOrder
+ LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId());
+ lqw.eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
+ List<DocumentMaterials> records = list(lqw);
+
+
+
+ //璁＄畻pageOrder
+ Long pageOrder = 1L;
+ if(documentMaterials.getPageNumber().equals(1))
+ pageOrder = 1L;
+ else {
+ Long maxPOrder = this.baseMapper.getMaxPageOrder(records.get(0).getTitle(), documentMaterials.getPageNumber(), records.get(0).getStage(), documentMaterials.getRecordId());
+ if (maxPOrder != null)
+ pageOrder = maxPOrder + 1;
+ }
+ //璁剧疆pageOrder
+ documentMaterials.setPageOrder(pageOrder);
+ //璁＄畻fileNumber
+ Long fileNumber = this.getFiNum(documentMaterials.getPageNumber(), documentMaterials.getRecordId());
+ documentMaterials.setFileNumber(fileNumber);
+ //淇敼椤靛彿
+ result = updateById(documentMaterials);
+ //鎶婂墿涓嬫墍鏈夌殑鐨刦ileNumber鍜宲ageOrder閮芥洿鏂颁竴閬�
+ LambdaQueryWrapper<DocumentMaterials> lqw1 = new LambdaQueryWrapper<>();
+ lqw.eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId());
+ // lqw.eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
+ List<DocumentMaterials> recordss = list(lqw1);
+ for(DocumentMaterials dt: recordss)
+ {
+ //璁＄畻pageOrder
+ Long pageOrder1 = 1L;
+ if(dt.getPageNumber().equals(1))
+ pageOrder1 = 1L;
+ else {
+ Long maxPOrder1 = this.baseMapper.getMaxPageOrder(dt.getTitle(), dt.getPageNumber(), dt.getStage(), dt.getRecordId());
+ if (maxPOrder1 != null)
+ pageOrder1 = maxPOrder1 + 1;
+ }
+ //璁剧疆pageOrder
+ dt.setPageOrder(pageOrder1);
+ //璁＄畻fileNumber
+ Long fileNumber1 = this.getFiNum(dt.getPageNumber(), dt.getRecordId());
+ dt.setFileNumber(fileNumber1);
+ //淇敼椤靛彿
+ updateById(dt);
+ }
+
+
+ } catch (Exception e) {
+ System.out.println(e);
+ throw new ErrorcodeExceptionextends(500, "鍚屼竴涓鍗峰唴锛屼笉鍏佽椤电爜閲嶅锛�");
+ }
if(result)
return 1;
else
@@ -168,22 +228,25 @@
}
@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, Long recordId) {
//鏍规嵁pageNumber鎷垮埌title锛岀劧鍚庤绠梡ageOrder
LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(recordId!=null, DocumentMaterials::getRecordId, recordId);
lqw.eq(pageNumber!=null, DocumentMaterials::getPageNumber, pageNumber);
List<DocumentMaterials> records = list(lqw);
+
+ //璁＄畻pageOrder
Long pageOrder = 1L;
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;
}
@@ -224,4 +287,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