From f0aac7e028b09aefa2428a8d66fdb81e466a89fe Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期三, 19 十一月 2025 15:35:52 +0800
Subject: [PATCH] 修改了对应代码
---
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 120 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 75 insertions(+), 45 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 800b22a..887bbce 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -6,10 +6,12 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ArchiveCategory;
+import com.ruoyi.domain.ArchiveRecords;
import com.ruoyi.domain.DocumentMaterials;
import com.ruoyi.domain.vo.*;
import com.ruoyi.mapper.DocumentMaterialsMapper;
@@ -40,6 +42,9 @@
.like(!StringUtils.isEmpty(documentMaterials.getPublicity()), DocumentMaterials::getPublicity, documentMaterials.getPublicity())
.like(!StringUtils.isEmpty(documentMaterials.getRetentionPeriod()), DocumentMaterials::getRetentionPeriod, documentMaterials.getRetentionPeriod())
.like(!StringUtils.isEmpty(documentMaterials.getSecurityLevel()), DocumentMaterials::getSecurityLevel, documentMaterials.getSecurityLevel())
+ .like(!StringUtils.isEmpty(documentMaterials.getTitle()), DocumentMaterials::getTitle, documentMaterials.getTitle())
+
+
.eq(documentMaterials.getDate()!=null, DocumentMaterials::getDate, documentMaterials.getDate())
.eq(documentMaterials.getRecordId()!=null, DocumentMaterials::getRecordId, documentMaterials.getRecordId())
.eq(documentMaterials.getPageNumber()!=null, DocumentMaterials::getPageNumber, documentMaterials.getPageNumber());
@@ -148,59 +153,79 @@
}
@Override
+ public List<DocumentMaterials> selectDocumentMaterialsByIds(Long[] ids) {
+ // 鑾峰彇褰撳墠鐢ㄦ埛ID
+ Long userid = SecurityUtils.getUserId();
+
+ // 鍒涘缓鏌ヨ鏉′欢
+ LambdaQueryWrapper<DocumentMaterials> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+
+ // 鏍规嵁ids鏌ヨ
+ lambdaQueryWrapper.in(DocumentMaterials::getMaterialId, Arrays.asList(ids));
+ lambdaQueryWrapper.orderByAsc(DocumentMaterials::getPageNumber);
+ // 濡傛灉涓嶆槸绠＄悊鍛橈紝闇�瑕佽�冭檻鏉冮檺杩囨护锛堝彲鏍规嵁瀹為檯鏉冮檺闇�姹傝皟鏁达級
+ if (userid != 1) {
+ // 杩欓噷鍙互娣诲姞鏉冮檺鐩稿叧鐨勮繃婊ゆ潯浠�
+ }
+
+ List<DocumentMaterials> beanRecords = list(lambdaQueryWrapper);
+ return beanRecords;
+ }
+
+ @Override
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);
+// //淇敼椤靛彿鎴愬姛涔嬪悗锛岃閲嶆柊鐢熸垚鏂囦欢鏉愭枡搴忓彿锛岄〉娆�
+// //鏍规嵁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);
+//
+// //璁＄畻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);
- }
+// //鎶婂墿涓嬫墍鏈夌殑鐨刦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) {
@@ -299,4 +324,9 @@
else
return null;
}
+
+ @Override
+ public boolean isPageNumberIslegal(Integer recordId) {
+ return this.baseMapper.isPageNumberLegal(recordId);
+ }
}
--
Gitblit v1.9.1