From ebeecf61232967a9c21ca4aa63ccec8e269b8c0e Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 29 九月 2025 09:13:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/archiveSystem
---
archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java | 24 ++--
archiveManager/src/main/java/com/ruoyi/service/impl/ArchivePlaceNameServiceImpl.java | 6 +
archiveManager/src/main/java/com/ruoyi/domain/ArchivePlaceName.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java | 24 ++--
archiveManager/src/main/java/com/ruoyi/mapper/ArchivePlaceNameMapper.java | 2
archiveManager/src/main/java/com/ruoyi/service/IArchiverecordstouserService.java | 30 ++--
archiveManager/src/main/java/com/ruoyi/service/IArchiveProjectNameService.java | 34 +++--
archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java | 7 +
archiveManager/src/main/java/com/ruoyi/domain/Archiverecordstouser.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java | 24 ++--
archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java | 2
archiveManager/src/main/java/com/ruoyi/service/IArchiveCategoryService.java | 30 ++--
archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java | 30 ++--
archiveManager/src/main/java/com/ruoyi/domain/ArchiveCategory.java | 2
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java | 30 ++--
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java | 23 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/DocumentMaterialsController.java | 24 ++--
archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java | 2
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java | 11 +
archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java | 7 +
archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveCategoryServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java | 22 +-
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 7 +
25 files changed, 202 insertions(+), 149 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveCategory.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveCategory.java
index a29827c..2f45523 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveCategory.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveCategory.java
@@ -12,7 +12,7 @@
import java.util.Date;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆戝璞� archive_category
+ * 銆愭鍗风被鍒俊鎭�戝璞� archive_category
*
* @author ruoyi
* @date 2025-07-26
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchivePlaceName.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchivePlaceName.java
index fae1c67..97fa03c 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchivePlaceName.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchivePlaceName.java
@@ -12,7 +12,7 @@
import java.util.Date;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆戝璞� archive_place_name
+ * 銆愭浠跺湴鍖虹鐞嗐�戝璞� archive_place_name
*
* @author ruoyi
* @date 2025-08-08
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java
index 7ce8758..34af99c 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/ArchiveProjectName.java
@@ -10,7 +10,7 @@
import java.util.Date;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆戝璞� archive_project_name
+ * 銆愭浠堕」鐩俊鎭�戝璞� archive_project_name
*
* @author ruoyi
* @date 2025-08-08
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/Archiverecordstouser.java b/archiveManager/src/main/java/com/ruoyi/domain/Archiverecordstouser.java
index 6fc130d..9460673 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/Archiverecordstouser.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/Archiverecordstouser.java
@@ -10,7 +10,7 @@
import com.ruoyi.common.core.domain.BaseEntity;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆戝璞� archiverecordstouser
+ * 銆愭。妗堝垎閰嶃�戝璞� archiverecordstouser
*
* @author ruoyi
* @date 2025-07-20
diff --git a/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java b/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java
index 964ea0c..0becc32 100644
--- a/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java
+++ b/archiveManager/src/main/java/com/ruoyi/domain/DocumentMaterials.java
@@ -14,7 +14,7 @@
import com.ruoyi.common.core.domain.BaseEntity;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆戝璞� document_materials
+ * 銆愭枃浠舵潗鏂欑患鍚堜俊鎭�戝璞� document_materials
*
* @author ruoyi
* @date 2025-07-26
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/ArchivePlaceNameMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/ArchivePlaceNameMapper.java
index 55e36b8..049079c 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/ArchivePlaceNameMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/ArchivePlaceNameMapper.java
@@ -8,7 +8,7 @@
import java.util.List;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慚apper鎺ュ彛
+ * 銆愭浠跺湴鍖轰俊鎭�慚apper鎺ュ彛
*
* @author ruoyi
* @date 2025-08-08
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
index 24d108e..76f9b7c 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/ArchiveRecordsMapper.java
@@ -31,7 +31,7 @@
@Select("select max(id) from archive_records")
Long findMaxId();
- @Select("UPDATE `archivesys`.`archive_records` SET `inquiry_number` = '', `case_title` = NULL, `public_attribute` = NULL, `preparation_unit` = NULL, `preparation_date` = NULL, `retention_period` = NULL, `security_classification` = NULL, `page_count` = NULL, `filing_number` = NULL, `construction_unit` = NULL, `construction_address` = NULL, `project_name` = '', `project_number` = NULL, `scanning_company` = NULL, `archive_room_number` = NULL, `microfilm_number` = NULL, `remarks` = NULL, `historical_reference_number` = NULL, `record_status` = NULL, `every_project_name` = NULL WHERE `id` = #{id}")
+ @Select("UPDATE `archivesys`.`archive_records` SET `inquiry_number` = '', `case_title` = NULL, `public_attribute` = NULL, `preparation_unit` = NULL, `preparation_date` = NULL, `retention_period` = NULL, `security_classification` = NULL, `page_count` = NULL, `filing_number` = NULL, `construction_unit` = NULL, `construction_address` = NULL, `project_name` = '', `project_number` = NULL, `scanning_company` = NULL, `archive_room_number` = NULL, `microfilm_number` = NULL, `remarks` = NULL, `historical_reference_number` = NULL, `record_status` = '寰呬慨鏀�', `every_project_name` = NULL WHERE `id` = #{id}")
Long updateAllInfoById(@Param("id") Long id);
@Select("select record_id,archive_room_number,microfilm_number,inquiry_number,case_title,preparation_date,preparation_unit,retention_period,security_classification from archive_records where id=#{id}")
diff --git a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
index 88d47fe..03505f9 100644
--- a/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
+++ b/archiveManager/src/main/java/com/ruoyi/mapper/DocumentMaterialsMapper.java
@@ -10,7 +10,12 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
-
+/**
+ * 銆愭枃浠舵潗鏂欑患鍚堜俊鎭�慚apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2025-07-26
+ */
@Mapper
public interface DocumentMaterialsMapper extends BaseMapper<DocumentMaterials> {
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchiveCategoryService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchiveCategoryService.java
index a87635f..edf4471 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchiveCategoryService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchiveCategoryService.java
@@ -12,7 +12,7 @@
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice鎺ュ彛
+ * 銆愭鍗风被鍒俊鎭�慡ervice鎺ュ彛
*
* @author ruoyi
* @date 2025-07-26
@@ -24,49 +24,49 @@
AjaxResult selectDataList(ArchiveCategory archiveCategory, Integer pageNum, Integer pageSize);
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏌ヨ銆愭鍗风被鍒俊鎭��
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param id 銆愭鍗风被鍒俊鎭�戜富閿�
+ * @return 銆愭鍗风被鍒俊鎭��
*/
public ArchiveCategory selectArchiveCategoryById(Long id);
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭鍗风被鍒俊鎭�戝垪琛�
*
- * @param archiveCategory 銆愯濉啓鍔熻兘鍚嶇О銆�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆戦泦鍚�
+ * @param archiveCategory 銆愭鍗风被鍒俊鎭��
+ * @return 銆愭鍗风被鍒俊鎭�戦泦鍚�
*/
public List<ArchiveCategory> selectArchiveCategoryList(ArchiveCategory archiveCategory);
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭鍗风被鍒俊鎭��
*
- * @param archiveCategory 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiveCategory 銆愭鍗风被鍒俊鎭��
* @return 缁撴灉
*/
public int insertArchiveCategory(ArchiveCategory archiveCategory);
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭鍗风被鍒俊鎭��
*
- * @param archiveCategory 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiveCategory 銆愭鍗风被鍒俊鎭��
* @return 缁撴灉
*/
public int updateArchiveCategory(ArchiveCategory archiveCategory);
/**
- * 鎵归噺鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鎵归噺鍒犻櫎銆愭鍗风被鍒俊鎭��
*
- * @param ids 闇�瑕佸垹闄ょ殑銆愯濉啓鍔熻兘鍚嶇О銆戜富閿泦鍚�
+ * @param ids 闇�瑕佸垹闄ょ殑銆愭鍗风被鍒俊鎭�戜富閿泦鍚�
* @return 缁撴灉
*/
public int deleteArchiveCategoryByIds(Long[] ids);
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆戜俊鎭�
+ * 鍒犻櫎銆愭鍗风被鍒俊鎭�戜俊鎭�
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+ * @param id 銆愭鍗风被鍒俊鎭�戜富閿�
* @return 缁撴灉
*/
public int deleteArchiveCategoryById(Long id);
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java
index f22702b..b6ed932 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchivePlaceNameService.java
@@ -9,7 +9,7 @@
import java.util.List;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice鎺ュ彛
+ * 銆愭浠跺湴鍖轰俊鎭�慡ervice鎺ュ彛
*
* @author ruoyi
* @date 2025-08-08
@@ -21,49 +21,49 @@
AjaxResult selectDataList(ArchivePlaceName archivePlaceName, Integer pageNum, Integer pageSize);
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏌ヨ銆愭浠跺湴鍖轰俊鎭��
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param id 銆愭浠跺湴鍖轰俊鎭�戜富閿�
+ * @return 銆愭浠跺湴鍖轰俊鎭��
*/
public ArchivePlaceName selectArchivePlaceNameById(Long id);
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭浠跺湴鍖轰俊鎭�戝垪琛�
*
- * @param archivePlaceName 銆愯濉啓鍔熻兘鍚嶇О銆�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆戦泦鍚�
+ * @param archivePlaceName 銆愭浠跺湴鍖轰俊鎭��
+ * @return 銆愭浠跺湴鍖轰俊鎭�戦泦鍚�
*/
public List<ArchivePlaceName> selectArchivePlaceNameList(ArchivePlaceName archivePlaceName);
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭浠跺湴鍖轰俊鎭��
*
- * @param archivePlaceName 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archivePlaceName 銆愭浠跺湴鍖轰俊鎭��
* @return 缁撴灉
*/
public int insertArchivePlaceName(ArchivePlaceName archivePlaceName);
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭浠跺湴鍖轰俊鎭��
*
- * @param archivePlaceName 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archivePlaceName 銆愭浠跺湴鍖轰俊鎭��
* @return 缁撴灉
*/
public int updateArchivePlaceName(ArchivePlaceName archivePlaceName);
/**
- * 鎵归噺鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鎵归噺鍒犻櫎銆愭浠跺湴鍖轰俊鎭��
*
- * @param ids 闇�瑕佸垹闄ょ殑銆愯濉啓鍔熻兘鍚嶇О銆戜富閿泦鍚�
+ * @param ids 闇�瑕佸垹闄ょ殑銆愭浠跺湴鍖轰俊鎭�戜富閿泦鍚�
* @return 缁撴灉
*/
public int deleteArchivePlaceNameByIds(Long[] ids);
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆戜俊鎭�
+ * 鍒犻櫎銆愭浠跺湴鍖轰俊鎭�戜俊鎭�
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+ * @param id 銆愭浠跺湴鍖轰俊鎭�戜富閿�
* @return 缁撴灉
*/
public int deleteArchivePlaceNameById(Long id);
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchiveProjectNameService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchiveProjectNameService.java
index fce4fa6..acab211 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchiveProjectNameService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchiveProjectNameService.java
@@ -7,54 +7,60 @@
import java.util.List;
+/**
+ * 銆愭浠堕」鐩俊鎭�慡ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2025-07-26
+ */
public interface IArchiveProjectNameService {
AjaxResult selectDataList(ArchiveProjectName archiveProjectName, Integer pageNum, Integer pageSize);
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏌ヨ銆愭浠堕」鐩俊鎭��
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param id 銆愭浠堕」鐩俊鎭�戜富閿�
+ * @return 銆愭浠堕」鐩俊鎭��
*/
public ArchiveProjectName selectArchiveProjectNameById(Long id);
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭浠堕」鐩俊鎭�戝垪琛�
*
- * @param archiveProjectName 銆愯濉啓鍔熻兘鍚嶇О銆�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆戦泦鍚�
+ * @param archiveProjectName 銆愭浠堕」鐩俊鎭��
+ * @return 銆愭浠堕」鐩俊鎭�戦泦鍚�
*/
public List<ArchiveProjectName> selectArchiveProjectNameList(ArchiveProjectName archiveProjectName);
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭浠堕」鐩俊鎭��
*
- * @param archiveProjectName 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiveProjectName 銆愭浠堕」鐩俊鎭��
* @return 缁撴灉
*/
public int insertArchiveProjectName(ArchiveProjectName archiveProjectName);
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭浠堕」鐩俊鎭��
*
- * @param archiveProjectName 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiveProjectName 銆愭浠堕」鐩俊鎭��
* @return 缁撴灉
*/
public int updateArchiveProjectName(ArchiveProjectName archiveProjectName);
/**
- * 鎵归噺鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鎵归噺鍒犻櫎銆愭浠堕」鐩俊鎭��
*
- * @param ids 闇�瑕佸垹闄ょ殑銆愯濉啓鍔熻兘鍚嶇О銆戜富閿泦鍚�
+ * @param ids 闇�瑕佸垹闄ょ殑銆愭浠堕」鐩俊鎭�戜富閿泦鍚�
* @return 缁撴灉
*/
public int deleteArchiveProjectNameByIds(Long[] ids);
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆戜俊鎭�
+ * 鍒犻櫎銆愭浠堕」鐩俊鎭�戜俊鎭�
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+ * @param id 銆愭浠堕」鐩俊鎭�戜富閿�
* @return 缁撴灉
*/
public int deleteArchiveProjectNameById(Long id);
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IArchiverecordstouserService.java b/archiveManager/src/main/java/com/ruoyi/service/IArchiverecordstouserService.java
index 7af6d4d..8c83fb7 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IArchiverecordstouserService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IArchiverecordstouserService.java
@@ -8,7 +8,7 @@
import java.util.List;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice鎺ュ彛
+ * 銆愭。妗堝垎閰嶃�慡ervice鎺ュ彛
*
* @author ruoyi
* @date 2025-07-20
@@ -19,10 +19,10 @@
AjaxResult selectDataList(Archiverecordstouser archiverecordstouser, Integer pageNum, Integer pageSize);
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏌ヨ銆愭。妗堝垎閰嶃��
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param id 銆愭。妗堝垎閰嶃�戜富閿�
+ * @return 銆愭。妗堝垎閰嶃��
*/
public Archiverecordstouser selectArchiverecordstouserById(Long id);
@@ -30,41 +30,41 @@
public boolean selectArchiveRecordUsers(String recordId);
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭。妗堝垎閰嶃�戝垪琛�
*
- * @param archiverecordstouser 銆愯濉啓鍔熻兘鍚嶇О銆�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆戦泦鍚�
+ * @param archiverecordstouser 銆愭。妗堝垎閰嶃��
+ * @return 銆愭。妗堝垎閰嶃�戦泦鍚�
*/
public List<Archiverecordstouser> selectArchiverecordstouserList(Archiverecordstouser archiverecordstouser);
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭。妗堝垎閰嶃��
*
- * @param archiverecordstouser 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiverecordstouser 銆愭。妗堝垎閰嶃��
* @return 缁撴灉
*/
public int insertArchiverecordstouser(Archiverecordstouser archiverecordstouser);
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭。妗堝垎閰嶃��
*
- * @param archiverecordstouser 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiverecordstouser 銆愭。妗堝垎閰嶃��
* @return 缁撴灉
*/
public int updateArchiverecordstouser(Archiverecordstouser archiverecordstouser);
/**
- * 鎵归噺鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鎵归噺鍒犻櫎銆愭。妗堝垎閰嶃��
*
- * @param ids 闇�瑕佸垹闄ょ殑銆愯濉啓鍔熻兘鍚嶇О銆戜富閿泦鍚�
+ * @param ids 闇�瑕佸垹闄ょ殑銆愭。妗堝垎閰嶃�戜富閿泦鍚�
* @return 缁撴灉
*/
public int deleteArchiverecordstouserByIds(Long[] ids);
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆戜俊鎭�
+ * 鍒犻櫎銆愭。妗堝垎閰嶃�戜俊鎭�
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+ * @param id 銆愭。妗堝垎閰嶃�戜富閿�
* @return 缁撴灉
*/
public int deleteArchiverecordstouserById(Long id);
diff --git a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
index 97ab26a..a89b71d 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/IDocumentMaterialsService.java
@@ -10,7 +10,12 @@
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
-
+/**
+ * 銆愭枃浠舵潗鏂欑患鍚堜俊鎭�慡ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2025-07-26
+ */
public interface IDocumentMaterialsService {
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveCategoryServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveCategoryServiceImpl.java
index bac075b..dd324e4 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveCategoryServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveCategoryServiceImpl.java
@@ -32,7 +32,7 @@
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice涓氬姟灞傚鐞�
+ * 銆愭鍗风被鍒俊鎭�慡ervice涓氬姟灞傚鐞�
*
* @author ruoyi
* @date 2025-07-26
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchivePlaceNameServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchivePlaceNameServiceImpl.java
index 4e243c5..2dc2246 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchivePlaceNameServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchivePlaceNameServiceImpl.java
@@ -26,6 +26,12 @@
import com.ruoyi.mapper.ArchivePlaceNameMapper;
import org.springframework.web.multipart.MultipartFile;
+/**
+ * 銆愭浠跺湴鍖轰俊鎭�慡ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2025-07-26
+ */
@Service
public class ArchivePlaceNameServiceImpl extends ServiceImpl<ArchivePlaceNameMapper, ArchivePlaceName> implements IArchivePlaceNameService {
private LambdaQueryWrapper<ArchivePlaceName> buildCondition(ArchivePlaceName archivePlaceName){
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
index 678cc12..162a928 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveProjectNameServiceImpl.java
@@ -23,13 +23,20 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
-
+/**
+ * 銆愭浠堕」鐩俊鎭�慡ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2025-07-26
+ */
@Service
public class ArchiveProjectNameServiceImpl extends ServiceImpl<ArchiveProjectNameMapper, ArchiveProjectName> implements IArchiveProjectNameService {
private LambdaQueryWrapper<ArchiveProjectName> buildCondition(ArchiveProjectName archiveProjectName){
LambdaQueryWrapper<ArchiveProjectName> lqw = new LambdaQueryWrapper<>();
- lqw.like(!StringUtils.isEmpty(archiveProjectName.getName()), ArchiveProjectName::getName, archiveProjectName.getName());
+ lqw.like(!StringUtils.isEmpty(archiveProjectName.getCompanyName()), ArchiveProjectName::getCompanyName, archiveProjectName.getCompanyName())
+ .like(!StringUtils.isEmpty(archiveProjectName.getCreatePerson()), ArchiveProjectName::getCreatePerson, archiveProjectName.getCreatePerson())
+ .like(!StringUtils.isEmpty(archiveProjectName.getName()), ArchiveProjectName::getName, archiveProjectName.getName());
lqw.orderByDesc(ArchiveProjectName::getCreateTime);
System.out.println("ssssssssssssddd0000000000000000");
return lqw;
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
index 834babd..c7c3d40 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiveRecordsServiceImpl.java
@@ -46,12 +46,29 @@
LambdaQueryWrapper<ArchiveRecords> lqw = new LambdaQueryWrapper<>();
System.out.println(archiveRecords.getIds());
- lqw.like(!StringUtils.isEmpty(archiveRecords.getProjectName()), ArchiveRecords::getProjectName, archiveRecords.getProjectName())
+
+ lqw.like(!StringUtils.isEmpty(archiveRecords.getRecordId()), ArchiveRecords::getRecordId, archiveRecords.getRecordId())
+ .like(!StringUtils.isEmpty(archiveRecords.getInquiryNumber()), ArchiveRecords::getInquiryNumber, archiveRecords.getInquiryNumber())
+ .like(!StringUtils.isEmpty(archiveRecords.getCaseTitle()), ArchiveRecords::getCaseTitle, archiveRecords.getCaseTitle())
+ .like(!StringUtils.isEmpty(archiveRecords.getPublicAttribute()), ArchiveRecords::getPublicAttribute, archiveRecords.getPublicAttribute())
+ .like(!StringUtils.isEmpty(archiveRecords.getPreparationUnit()), ArchiveRecords::getPreparationUnit, archiveRecords.getPreparationUnit())
+ .like(!StringUtils.isEmpty(archiveRecords.getRetentionPeriod()), ArchiveRecords::getRetentionPeriod, archiveRecords.getRetentionPeriod())
+ .like(!StringUtils.isEmpty(archiveRecords.getSecurityClassification()), ArchiveRecords::getSecurityClassification, archiveRecords.getSecurityClassification())
.like(!StringUtils.isEmpty(archiveRecords.getFilingNumber()), ArchiveRecords::getFilingNumber, archiveRecords.getFilingNumber())
+ .like(!StringUtils.isEmpty(archiveRecords.getConstructionUnit()), ArchiveRecords::getConstructionUnit, archiveRecords.getConstructionUnit())
+ .like(!StringUtils.isEmpty(archiveRecords.getConstructionAddress()), ArchiveRecords::getConstructionAddress, archiveRecords.getConstructionAddress())
+ .like(!StringUtils.isEmpty(archiveRecords.getProjectName()), ArchiveRecords::getProjectName, archiveRecords.getProjectName())
+ .like(!StringUtils.isEmpty(archiveRecords.getProjectNumber()), ArchiveRecords::getProjectNumber, archiveRecords.getProjectNumber())
+ .like(!StringUtils.isEmpty(archiveRecords.getScanningCompany()), ArchiveRecords::getScanningCompany, archiveRecords.getScanningCompany())
.like(!StringUtils.isEmpty(archiveRecords.getArchiveRoomNumber()), ArchiveRecords::getArchiveRoomNumber, archiveRecords.getArchiveRoomNumber())
- .like(!StringUtils.isEmpty(archiveRecords.getRecordId()), ArchiveRecords::getRecordId, archiveRecords.getRecordId())
+ .like(!StringUtils.isEmpty(archiveRecords.getMicrofilmNumber()), ArchiveRecords::getMicrofilmNumber, archiveRecords.getMicrofilmNumber())
+ .like(!StringUtils.isEmpty(archiveRecords.getHistoricalReferenceNumber()), ArchiveRecords::getHistoricalReferenceNumber, archiveRecords.getHistoricalReferenceNumber())
.eq(!StringUtils.isEmpty(archiveRecords.getRecordStatus()), ArchiveRecords::getRecordStatus, archiveRecords.getRecordStatus())
- ;
+ .like(!StringUtils.isEmpty(archiveRecords.getEveryProjectName()), ArchiveRecords::getEveryProjectName, archiveRecords.getEveryProjectName())
+ .like(!StringUtils.isEmpty(archiveRecords.getRemarks()), ArchiveRecords::getRemarks, archiveRecords.getRemarks());
+
+
+
if(archiveRecords.getIds()!=null)
lqw.in(ArchiveRecords::getId,new ArrayList<>(Arrays.asList(archiveRecords.getIds())));
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
index fb5bef9..0bfcf59 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/ArchiverecordstouserServiceImpl.java
@@ -26,7 +26,7 @@
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慡ervice涓氬姟灞傚鐞�
+ * 銆愭。妗堝垎閰嶃�慡ervice涓氬姟灞傚鐞�
*
* @author ruoyi
* @date 2025-07-20
@@ -109,10 +109,10 @@
return AjaxResult.success(data); }
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏌ヨ銆愭。妗堝垎閰嶃��
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param id 銆愭。妗堝垎閰嶃�戜富閿�
+ * @return 銆愭。妗堝垎閰嶃��
*/
@Override
public Archiverecordstouser selectArchiverecordstouserById(Long id)
@@ -134,17 +134,17 @@
}
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭。妗堝垎閰嶃�戝垪琛�
*
- * @param archiverecordstouser 銆愯濉啓鍔熻兘鍚嶇О銆�
- * @return 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiverecordstouser 銆愭。妗堝垎閰嶃��
+ * @return 銆愭。妗堝垎閰嶃��
*/
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭。妗堝垎閰嶃��
*
- * @param archiverecordstouser 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiverecordstouser 銆愭。妗堝垎閰嶃��
* @return 缁撴灉
*/
@Override
@@ -154,9 +154,9 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭。妗堝垎閰嶃��
*
- * @param archiverecordstouser 銆愯濉啓鍔熻兘鍚嶇О銆�
+ * @param archiverecordstouser 銆愭。妗堝垎閰嶃��
* @return 缁撴灉
*/
@Override
@@ -166,9 +166,9 @@
}
/**
- * 鎵归噺鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鎵归噺鍒犻櫎銆愭。妗堝垎閰嶃��
*
- * @param ids 闇�瑕佸垹闄ょ殑銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+ * @param ids 闇�瑕佸垹闄ょ殑銆愭。妗堝垎閰嶃�戜富閿�
* @return 缁撴灉
*/
@Override
@@ -178,9 +178,9 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆戜俊鎭�
+ * 鍒犻櫎銆愭。妗堝垎閰嶃�戜俊鎭�
*
- * @param id 銆愯濉啓鍔熻兘鍚嶇О銆戜富閿�
+ * @param id 銆愭。妗堝垎閰嶃�戜富閿�
* @return 缁撴灉
*/
@Override
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 1e3b757..183d7c5 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -24,7 +24,12 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.*;
-
+/**
+ * 銆愭枃浠舵潗鏂欑患鍚堜俊鎭�慡ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2025-07-26
+ */
@Service
public class DocumentMaterialsServiceImpl extends ServiceImpl<DocumentMaterialsMapper, DocumentMaterials> implements IDocumentMaterialsService {
private LambdaQueryWrapper<DocumentMaterials> buildCondition(DocumentMaterials documentMaterials){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java
index 8ef9dfc..9e21b41 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveCategoryController.java
@@ -26,7 +26,7 @@
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慍ontroller
+ * 銆愭鍗风被鍒俊鎭�慍ontroller
*
* @author ruoyi
* @date 2025-07-26
@@ -39,7 +39,7 @@
private IArchiveCategoryService archiveCategoryService;
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭鍗风被鍒俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:category:list')")
@GetMapping("/list")
@@ -58,10 +58,10 @@
return success(archiveCategoryService.selectArchiveCategoryList(archiveCategory));
}
/**
- * 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 瀵煎嚭銆愭鍗风被鍒俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:category:export')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
+ @Log(title = "銆愭鍗风被鍒俊鎭��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArchiveCategory archiveCategory)
{
@@ -73,7 +73,7 @@
}
/**
- * 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
+ * 鑾峰彇銆愭鍗风被鍒俊鎭�戣缁嗕俊鎭�
*/
@PreAuthorize("@ss.hasPermi('system:category:query')")
@GetMapping(value = "/{id}")
@@ -83,10 +83,10 @@
}
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭鍗风被鍒俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:category:add')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @Log(title = "銆愭鍗风被鍒俊鎭��", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArchiveCategory archiveCategory)
{
@@ -94,10 +94,10 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭鍗风被鍒俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:category:edit')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @Log(title = "銆愭鍗风被鍒俊鎭��", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArchiveCategory archiveCategory)
{
@@ -105,10 +105,10 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鍒犻櫎銆愭鍗风被鍒俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:category:remove')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
+ @Log(title = "銆愭鍗风被鍒俊鎭��", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
index 5be5dc8..c600cbd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchivePlaceNameController.java
@@ -27,7 +27,7 @@
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慍ontroller
+ * 銆愭浠跺湴鍖轰俊鎭�慍ontroller
*
* @author ruoyi
* @date 2025-08-08
@@ -40,7 +40,7 @@
private IArchivePlaceNameService archivePlaceNameService;
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭浠跺湴鍖轰俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:placeName:list')")
@GetMapping("/list")
@@ -59,20 +59,20 @@
return success(archivePlaceNameService.selectArchivePlaceNameList(archivePlaceName));
}
/**
- * 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 瀵煎嚭銆愭浠跺湴鍖轰俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:name:export')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
+ @Log(title = "銆愭浠跺湴鍖轰俊鎭��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArchivePlaceName archivePlaceName)
{
List<ArchivePlaceName> list = archivePlaceNameService.selectArchivePlaceNameList(archivePlaceName);
ExcelUtil<ArchivePlaceName> util = new ExcelUtil<ArchivePlaceName>(ArchivePlaceName.class);
- util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
+ util.exportExcel(response, list, "銆愭浠跺湴鍖轰俊鎭�戞暟鎹�");
}
/**
- * 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
+ * 鑾峰彇銆愭浠跺湴鍖轰俊鎭�戣缁嗕俊鎭�
*/
@PreAuthorize("@ss.hasPermi('system:name:query')")
@GetMapping(value = "/{id}")
@@ -82,10 +82,10 @@
}
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭浠跺湴鍖轰俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:name:add')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @Log(title = "銆愭浠跺湴鍖轰俊鎭��", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArchivePlaceName archivePlaceName)
{
@@ -93,10 +93,10 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭浠跺湴鍖轰俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:name:edit')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @Log(title = "銆愭浠跺湴鍖轰俊鎭��", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArchivePlaceName archivePlaceName)
{
@@ -104,10 +104,10 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鍒犻櫎銆愭浠跺湴鍖轰俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:name:remove')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
+ @Log(title = "銆愭浠跺湴鍖轰俊鎭��", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
index aba47ed..a413ddf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiveProjectNameController.java
@@ -27,7 +27,7 @@
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慍ontroller
+ * 銆愭浠堕」鐩俊鎭�慍ontroller
*
* @author ruoyi
* @date 2025-08-08
@@ -40,7 +40,7 @@
private IArchiveProjectNameService archiveProjectNameService;
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭浠堕」鐩俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:projectName:list')")
@GetMapping("/list")
@@ -59,20 +59,20 @@
return success(archiveProjectNameService.selectArchiveProjectNameList(archivePlaceName));
}
/**
- * 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 瀵煎嚭銆愭浠堕」鐩俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:projectName:export')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
+ @Log(title = "銆愭浠堕」鐩俊鎭��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArchiveProjectName archiveProjectName)
{
List<ArchiveProjectName> list = archiveProjectNameService.selectArchiveProjectNameList(archiveProjectName);
ExcelUtil<ArchiveProjectName> util = new ExcelUtil<ArchiveProjectName>(ArchiveProjectName.class);
- util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
+ util.exportExcel(response, list, "銆愭浠堕」鐩俊鎭�戞暟鎹�");
}
/**
- * 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
+ * 鑾峰彇銆愭浠堕」鐩俊鎭�戣缁嗕俊鎭�
*/
@PreAuthorize("@ss.hasPermi('system:projectName:query')")
@GetMapping(value = "/{id}")
@@ -82,10 +82,10 @@
}
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭浠堕」鐩俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:projectName:add')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @Log(title = "銆愭浠堕」鐩俊鎭��", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArchiveProjectName archiveProjectName)
{
@@ -94,10 +94,10 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭浠堕」鐩俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:projectName:edit')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @Log(title = "銆愭浠堕」鐩俊鎭��", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArchiveProjectName archiveProjectName)
{
@@ -105,10 +105,10 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鍒犻櫎銆愭浠堕」鐩俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:projectName:remove')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
+ @Log(title = "銆愭浠堕」鐩俊鎭��", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java
index 1dc200c..a300c4f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/archive/ArchiverecordstouserController.java
@@ -34,7 +34,7 @@
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慍ontroller
+ * 銆愭。妗堝垎閰嶃�慍ontroller
*
* @author ruoyi
* @date 2025-07-20
@@ -66,7 +66,7 @@
return toAjax(200);
}
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭。妗堝垎閰嶃�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:list')")
@GetMapping("/list")
@@ -99,20 +99,20 @@
util.exportExcel(response, list, "瀵煎嚭缁熻淇℃伅");
}
/**
- * 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 瀵煎嚭銆愭。妗堝垎閰嶃�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:export')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
+ @Log(title = "銆愭。妗堝垎閰嶃��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, Archiverecordstouser archiverecordstouser)
{
List<Archiverecordstouser> list = archiverecordstouserService.selectArchiverecordstouserList(archiverecordstouser);
ExcelUtil<Archiverecordstouser> util = new ExcelUtil<Archiverecordstouser>(Archiverecordstouser.class);
- util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
+ util.exportExcel(response, list, "銆愭。妗堝垎閰嶃�戞暟鎹�");
}
/**
- * 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
+ * 鑾峰彇銆愭。妗堝垎閰嶃�戣缁嗕俊鎭�
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:query')")
@GetMapping(value = "/{id}")
@@ -122,10 +122,10 @@
}
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭。妗堝垎閰嶃��
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:add')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @Log(title = "銆愭。妗堝垎閰嶃��", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody Archiverecordstouser archiverecordstouser)
{
@@ -133,10 +133,10 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭。妗堝垎閰嶃��
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:edit')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @Log(title = "銆愭。妗堝垎閰嶃��", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody Archiverecordstouser archiverecordstouser)
{
@@ -144,10 +144,10 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鍒犻櫎銆愭。妗堝垎閰嶃��
*/
@PreAuthorize("@ss.hasPermi('system:archiverecordstouser:remove')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
+ @Log(title = "銆愭。妗堝垎閰嶃��", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
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 e718fdf..23498b4 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
@@ -41,7 +41,7 @@
import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
- * 銆愯濉啓鍔熻兘鍚嶇О銆慍ontroller
+ * 銆愭枃浠舵潗鏂欑患鍚堜俊鎭�慍ontroller
*
* @author ruoyi
* @date 2025-07-28
@@ -57,7 +57,7 @@
private IDocumentMaterialsService documentMaterialsService;
/**
- * 鏌ヨ銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 鏌ヨ銆愭枃浠舵潗鏂欑患鍚堜俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:materials:list')")
@GetMapping("/list")
@@ -70,20 +70,20 @@
}
/**
- * 瀵煎嚭銆愯濉啓鍔熻兘鍚嶇О銆戝垪琛�
+ * 瀵煎嚭銆愭枃浠舵潗鏂欑患鍚堜俊鎭�戝垪琛�
*/
@PreAuthorize("@ss.hasPermi('system:materials:export')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.EXPORT)
+ @Log(title = "銆愭枃浠舵潗鏂欑患鍚堜俊鎭��", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, DocumentMaterials documentMaterials)
{
List<DocumentMaterials> list = documentMaterialsService.selectDocumentMaterialsList(documentMaterials);
ExcelUtil<DocumentMaterials> util = new ExcelUtil<DocumentMaterials>(DocumentMaterials.class);
- util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
+ util.exportExcel(response, list, "銆愭枃浠舵潗鏂欑患鍚堜俊鎭�戞暟鎹�");
}
/**
- * 鑾峰彇銆愯濉啓鍔熻兘鍚嶇О銆戣缁嗕俊鎭�
+ * 鑾峰彇銆愭枃浠舵潗鏂欑患鍚堜俊鎭�戣缁嗕俊鎭�
*/
@PreAuthorize("@ss.hasPermi('system:materials:query')")
@GetMapping(value = "/{materialId}")
@@ -93,10 +93,10 @@
}
/**
- * 鏂板銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鏂板銆愭枃浠舵潗鏂欑患鍚堜俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:materials:add')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.INSERT)
+ @Log(title = "銆愭枃浠舵潗鏂欑患鍚堜俊鎭��", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody DocumentMaterials documentMaterials)
{
@@ -106,12 +106,12 @@
}
/**
- * 淇敼銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 淇敼銆愭枃浠舵潗鏂欑患鍚堜俊鎭��
*
* system:materials:edit
*/
@PreAuthorize("@ss.hasPermi('system:materials:edit')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.UPDATE)
+ @Log(title = "銆愭枃浠舵潗鏂欑患鍚堜俊鎭��", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody DocumentMaterials documentMaterials)
{
@@ -119,10 +119,10 @@
}
/**
- * 鍒犻櫎銆愯濉啓鍔熻兘鍚嶇О銆�
+ * 鍒犻櫎銆愭枃浠舵潗鏂欑患鍚堜俊鎭��
*/
@PreAuthorize("@ss.hasPermi('system:materials:remove')")
- @Log(title = "銆愯濉啓鍔熻兘鍚嶇О銆�", businessType = BusinessType.DELETE)
+ @Log(title = "銆愭枃浠舵潗鏂欑患鍚堜俊鎭��", businessType = BusinessType.DELETE)
@DeleteMapping("/{materialIds}")
public AjaxResult remove(@PathVariable String[] materialIds)
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index 138b287..517242a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -89,6 +89,8 @@
ajax.put("uuid", uuid);
ajax.put("img", Base64.encode(os.toByteArray()));
+ ajax.put("imgCode", code);
+
return ajax;
}
}
--
Gitblit v1.9.1