From 07a2f9c762efb3be3a29e2e8cc7004d4164cc9d8 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 22 十二月 2025 20:15:58 +0800
Subject: [PATCH] 修改了对应代码
---
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 100 +++++++++++++++++++++++--------------------------
1 files changed, 47 insertions(+), 53 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 f34a9d5..90cc40f 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -176,58 +177,39 @@
public int updateDocumentMaterials(DocumentMaterials documentMaterials) {
boolean result = false;
try {
-
-// //淇敼椤靛彿鎴愬姛涔嬪悗锛岃閲嶆柊鐢熸垚鏂囦欢鏉愭枡搴忓彿锛岄〉娆�
-// //鏍规嵁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);
-// }
-
-
+ // 浣跨敤LambdaUpdateWrapper鏋勯�犳洿鏂版潯浠讹紝纭繚null鍊间篃鑳芥洿鏂板埌鏁版嵁搴�
+ LambdaUpdateWrapper<DocumentMaterials> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(DocumentMaterials::getMaterialId, documentMaterials.getMaterialId());
+
+ // 鏄庣‘璁剧疆闇�瑕佹洿鏂扮殑瀛楁
+ updateWrapper.set(DocumentMaterials::getFileNumber, documentMaterials.getFileNumber());
+ updateWrapper.set(DocumentMaterials::getDocumentNumber, documentMaterials.getDocumentNumber());
+ updateWrapper.set(DocumentMaterials::getCreator, documentMaterials.getCreator());
+ updateWrapper.set(DocumentMaterials::getTitle, documentMaterials.getTitle());
+ updateWrapper.set(DocumentMaterials::getDate, documentMaterials.getDate());
+ updateWrapper.set(DocumentMaterials::getPageNumber, documentMaterials.getPageNumber()); // 鍏佽鏇存柊涓簄ull
+ updateWrapper.set(DocumentMaterials::getPageOrder, documentMaterials.getPageOrder());
+ updateWrapper.set(DocumentMaterials::getStage, documentMaterials.getStage());
+ updateWrapper.set(DocumentMaterials::getPublicity, documentMaterials.getPublicity());
+ updateWrapper.set(DocumentMaterials::getIsAttachment, documentMaterials.getIsAttachment());
+ updateWrapper.set(DocumentMaterials::getIsDiagram, documentMaterials.getIsDiagram());
+ updateWrapper.set(DocumentMaterials::getRetentionPeriod, documentMaterials.getRetentionPeriod());
+ updateWrapper.set(DocumentMaterials::getSecurityLevel, documentMaterials.getSecurityLevel());
+ updateWrapper.set(DocumentMaterials::getIsSensitive, documentMaterials.getIsSensitive());
+ updateWrapper.set(DocumentMaterials::getIsCanceled, documentMaterials.getIsCanceled());
+ updateWrapper.set(DocumentMaterials::getFormat, documentMaterials.getFormat());
+ updateWrapper.set(DocumentMaterials::getSizeType, documentMaterials.getSizeType());
+ updateWrapper.set(DocumentMaterials::getHorizontalResolution, documentMaterials.getHorizontalResolution());
+ updateWrapper.set(DocumentMaterials::getVerticalResolution, documentMaterials.getVerticalResolution());
+ updateWrapper.set(DocumentMaterials::getWidth, documentMaterials.getWidth());
+ updateWrapper.set(DocumentMaterials::getHeight, documentMaterials.getHeight());
+ updateWrapper.set(DocumentMaterials::getFileSize, documentMaterials.getFileSize());
+ updateWrapper.set(DocumentMaterials::getAttachmentHistoryNumbers, documentMaterials.getAttachmentHistoryNumbers());
+ updateWrapper.set(DocumentMaterials::getRemarks, documentMaterials.getRemarks());
+ updateWrapper.set(DocumentMaterials::getVisible, documentMaterials.getVisible());
+ updateWrapper.set(DocumentMaterials::getFileStyle, documentMaterials.getFileStyle());
+ // 鎵ц鏇存柊鎿嶄綔
+ result = update(updateWrapper);
} catch (Exception e) {
System.out.println(e);
throw new ErrorcodeExceptionextends(500, "鍚屼竴涓鍗峰唴锛屼笉鍏佽椤电爜閲嶅锛�");
@@ -254,7 +236,7 @@
@Override
public Long getFiNum(Long pageNumber, Long recordId) {
- return this.baseMapper.getFileNumber(pageNumber, recordId);
+ return this.baseMapper.getFileNumber(pageNumber, recordId)+1;
}
@Override
@@ -308,6 +290,7 @@
DocumentMaterials documentMaterials = new DocumentMaterials();
BeanUtils.copyProperties(archiveCategory, documentMaterials);
documentMaterials.setRecordId(Long.parseLong(recordId));
+ documentMaterials.setVisible(1);
this.insertDocumentMaterials(documentMaterials);
}
@@ -341,6 +324,7 @@
// 鑾峰彇鎸囧畾recordId涓嬬殑鎵�鏈夎褰曪紝鎸夐〉鍙峰崌搴忔帓鍒�
LambdaQueryWrapper<DocumentMaterials> lqw = new LambdaQueryWrapper<>();
lqw.eq(DocumentMaterials::getRecordId, recordId);
+ lqw.ne(DocumentMaterials::getFileStyle, "鍏朵粬鏉愭枡");
lqw.orderByAsc(DocumentMaterials::getPageNumber);
List<DocumentMaterials> records = this.list(lqw);
@@ -384,6 +368,8 @@
newRecord.setFileSize(null);
newRecord.setFormat(null);
newRecord.setUrl(null);
+ //涓嶅湪鍓嶇鏄剧ず
+ newRecord.setVisible(0);
// 娣诲姞鍒颁腑闂磋褰曞垪琛�
middleRecords.add(newRecord);
}
@@ -436,4 +422,12 @@
return AjaxResult.error("娣诲姞涓棿璁板綍澶辫触锛�" + e.getMessage());
}
}
+
+ @Override
+ public Boolean judgeInfo(int recordId) {
+
+ return this.baseMapper.judgeArchiveInfo(recordId);
+ }
}
+
+
--
Gitblit v1.9.1