From cd9dfa81440b1e39aa1ae8411d1d284ee41ed9f5 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期五, 10 十月 2025 11:34:58 +0800
Subject: [PATCH] 新增recordid
---
archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java | 8 ++++----
archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 6 +++---
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 6 +++---
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
index 03505f9..f55778a 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
@@ -24,12 +24,12 @@
//鏍规嵁棰樺悕鎷垮埌鏈�澶х殑pageOrder
- @Select("select count(*) from document_materials where title=#{title} and page_number<#{pageNumber} and stage=#{stage}")
- Long getMaxPageOrder(@Param("title")String title,@Param("pageNumber") Long pageNumber,@Param("stage") String stage);
+ @Select("select count(*) from document_materials where title=#{title} and page_number<#{pageNumber} and stage=#{stage} and record_id=#{recordId}")
+ Long getMaxPageOrder(@Param("title")String title,@Param("pageNumber") Long pageNumber,@Param("stage") String stage,@Param("recordId") Long recordId);
//璁＄畻鏂囦欢鐨勫簭鍙�
- @Select("select count(distinct(title))-1 from document_materials where page_number<=#{pageNumber}")
- Long getFileNumber(@Param("pageNumber") Long pageNumber);
+ @Select("select count(distinct(title))-1 from document_materials where page_number<=#{pageNumber} and record_id=#{recordId}")
+ Long getFileNumber(@Param("pageNumber") Long pageNumber,@Param("recordId") Long recordId);
//鏌ヨ鍗峰唴鐩綍
@Select(
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
index a89b71d..20469c0 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
@@ -69,7 +69,7 @@
* @return 缁撴灉
*/
public int deleteDocumentMaterialsByMaterialId(String materialId);
- public Long getFiNum(Long pageNumber);
+ public Long getFiNum(Long pageNumber,Long recordId);
public int updateByPageNumber(Long pageNumber,String sizeType, Long fileNumber, int wid, int hei, int wdpi, int hdpi, double sz,String url,String format, Long recordId);
public List<DocumentMaterialsVo> findArchMInfo(String recordId);
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..e2c0780 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -168,8 +168,8 @@
}
@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
@@ -183,7 +183,7 @@
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;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
index 23498b4..ce74c1a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java
@@ -143,8 +143,8 @@
return "A0";
}
- @PostMapping("/upload")
- public AjaxResult uploadFile(MultipartFile file, Long recordId) throws Exception
+ @PostMapping("/upload/{recordId}")
+ public AjaxResult uploadFile(MultipartFile file,@PathVariable("recordId") Long recordId) throws Exception
{
// System.out.println("sdfd9999999999999999999999999999999");
try
@@ -181,7 +181,7 @@
int hdpi = info.getPhysicalHeightDpi();
System.out.println("DPI: " + info.getPhysicalWidthDpi());
//璁＄畻fileNumber
- Long fileNumber = documentMaterialsService.getFiNum(nam);
+ Long fileNumber = documentMaterialsService.getFiNum(nam,recordId);
//璁＄畻sizeType
String sizeType = getPageSize(wid*hei);
//鎻掑叆鏁版嵁搴撳搴旂殑url褰撲腑
--
Gitblit v1.9.1