修改添加时正式环境会报错的bug 修改ZZXM删除时移除redis缓存

3 years ago · 590726f98f
2 changed files with 74 additions and 68 deletions
--- a/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
+++ b/ruoyi-archives/src/main/java/com/ruoyi/archives/service/impl/ArchiveImportServiceImpl.java
@ -190,7 +190,13 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
				@@ -190,7 +190,13 @@ public class ArchiveImportServiceImpl implements ArchiveImportService {
            key = archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear();
        } else if (CategoryDict.ZXXM_RECORD.equals(type)|| CategoryDict.ZXXM_SECOND_RECORD.equals(type)) {
            // 咨询项目
-            key = archiveRecordInfo.getArchiveCategory().toUpperCase()+archiveRecordInfo.getProjectNumber();
+            String fileNum = archiveRecordInfo.getFileNum();
+            if (!fileNum.isEmpty() && fileNum.contains(CategoryDict.ZXXM_SECOND_RECORD)){
+                key = CategoryDict.ZXXM_SECOND_RECORD.toUpperCase() + archiveRecordInfo.getProjectNumber();
+            }else {
+                key =archiveRecordInfo.getArchiveCategory().toUpperCase()+archiveRecordInfo.getProjectNumber();
+            }
+
        } else if (CategoryDict.JYDA_RECORD.equals(type)) {
            //机要文件
            key = archiveRecordInfo.getArchiveCategory().toUpperCase()+ archiveRecordInfo.getYear();
--- a/ruoyi-archives/src/main/resources/mapper/archives/ArchiveRecordInfoMapper.xml
+++ b/ruoyi-archives/src/main/resources/mapper/archives/ArchiveRecordInfoMapper.xml
@ -222,73 +222,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
				@@ -222,73 +222,73 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--    </insert>-->

   <insert id="insertArchiveRecordInfo" parameterType="ArchiveRecordInfo">
-        INSERT INTO "public"."archive_record_info"(
-            "file_num",
-            "total_num",
-            "box_num",
-            "case_num",
-            "year",
-            "archive_category",
-            "archive_scope",
-            "box_name",
-            "department",
-            "storage_time",
-            "search_type",
-            "secret_level",
-            "address",
-            "major",
-            "number",
-            "pages",
-            "owner_name",
-            "start_date",
-            "end_date",
-            "description_time",
-            "category_code",
-            "cabinet_number",
-            "url",
-            "status",
-            "source",
-            "del_flag",
-            "place_dept",
-            "type",
-            "page_number",
-            "building_number",
-            "winners_unit",
-            "issuing_unit",
-            "size_des",
-            "create_time",
-            "update_time",
-            "remark",
-            "create_id",
-            "suffix_type",
-            "reject_reason",
-            "record_type",
-            "project_number",
-            "certificate_no",
-            "key_words",
-            "received_number",
-            "archive_date",
-            "interior_number",
-            "journal_name",
-            "country",
-            "partner",
-            "catalog_number",
-            "copies",
-            "location_num",
-            "explain_des",
-            "project_name",
-            "micro_no",
-            "piece_nums",
-            "drawing_nums",
-            "photo_nums",
-            "disc_number",
-            "provide_date",
-            "provide_user",
-            "original_path",
-            "photo_no",
-            "negative_no",
-            "see_no",
-            "appendix_address"
+        INSERT INTO "PUBLIC"."archive_record_info"(
+            "FILE_NUM",
+            "TOTAL_NUM",
+            "BOX_NUM",
+            "CASE_NUM",
+            "YEAR",
+            "ARCHIVE_CATEGORY",
+            "ARCHIVE_SCOPE",
+            "BOX_NAME",
+            "DEPARTMENT",
+            "STORAGE_TIME",
+            "SEARCH_TYPE",
+            "SECRET_LEVEL",
+            "ADDRESS",
+            "MAJOR",
+            "NUMBER",
+            "PAGES",
+            "OWNER_NAME",
+            "START_DATE",
+            "END_DATE",
+            "DESCRIPTION_TIME",
+            "CATEGORY_CODE",
+            "CABINET_NUMBER",
+            "URL",
+            "STATUS",
+            "SOURCE",
+            "DEL_FLAG",
+            "PLACE_DEPT",
+            "TYPE",
+            "PAGE_NUMBER",
+            "BUILDING_NUMBER",
+            "WINNERS_UNIT",
+            "ISSUING_UNIT",
+            "SIZE_DES",
+            "CREATE_TIME",
+            "UPDATE_TIME",
+            "REMARK",
+            "CREATE_ID",
+            "SUFFIX_TYPE",
+            "REJECT_REASON",
+            "RECORD_TYPE",
+            "PROJECT_NUMBER",
+            "CERTIFICATE_NO",
+            "KEY_WORDS",
+            "RECEIVED_NUMBER",
+            "ARCHIVE_DATE",
+            "INTERIOR_NUMBER",
+            "JOURNAL_NAME",
+            "COUNTRY",
+            "PARTNER",
+            "CATALOG_NUMBER",
+            "COPIES",
+            "LOCATION_NUM",
+            "EXPLAIN_DES",
+            "PROJECT_NAME",
+            "MICRO_NO",
+            "PIECE_NUMS",
+            "DRAWING_NUMS",
+            "PHOTO_NUMS",
+            "DISC_NUMBER",
+            "PROVIDE_DATE",
+            "PROVIDE_USER",
+            "ORIGINAL_PATH",
+            "PHOTO_NO",
+            "NEGATIVE_NO",
+            "SEE_NO",
+            "APPENDIX_ADDRESS"
        )
         VALUES(
        #{fileNum},