From 25d0b36cc39f51c7b03f28f30cfc6ed5a10769d3 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期日, 12 十月 2025 17:51:46 +0800
Subject: [PATCH] 修改了大量的代码块
---
archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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..a0fc494 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
@@ -24,12 +24,15 @@
//鏍规嵁棰樺悕鎷垮埌鏈�澶х殑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(
@@ -47,7 +50,7 @@
" is_canceled, format, size_type, horizontal_resolution, vertical_resolution, width,\n" +
" height, file_size, attachment_history_numbers,url, dm.remarks\n" +
" from document_materials as dm, archive_records as ar WHERE dm.record_id=ar.id \n" +
- "and dm.record_id=#{recordId}")
+ "and dm.record_id=#{recordId} and file_style!='鍏跺畠鏉愭枡' ")
List<DocumentMaterialsVoLarge> getDocumentMaterialsvoLarge(@Param("recordId") int recordId);
@Select("select count(*) as cnt, file_style from document_materials " +
--
Gitblit v1.9.1