From b4b6a3a036270941d2b9b94c4c73878853cb5137 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 16 九月 2023 14:40:00 +0800
Subject: [PATCH] 上传文件修改

---
 igds-core/src/main/java/com/ld/igds/file/ApplyOrderUploadProcessor.java |   35 +++++++++++++++++
 igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml        |    2 
 igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java        |   33 ----------------
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/file/ApplyOrderUploadProcessor.java b/igds-core/src/main/java/com/ld/igds/file/ApplyOrderUploadProcessor.java
index 165a5f0..86b0930 100644
--- a/igds-core/src/main/java/com/ld/igds/file/ApplyOrderUploadProcessor.java
+++ b/igds-core/src/main/java/com/ld/igds/file/ApplyOrderUploadProcessor.java
@@ -64,6 +64,41 @@
     }
 
     /**
+     * applyOrderUploadProcessor#uploadFile
+     * 鍒ゆ柇鏄惁涓婁紶
+     *
+     * @param file
+     * @param parameter
+     * @return fileId 鏂版枃浠禝D鍖呭惈鏂囦欢鍚庣紑
+     */
+    @FileResolver
+    public String uploadFile(UploadFile file, Map<String, Object> parameter) {
+        String fileId = null;
+        String mark = (String) parameter.get("mark");
+        if ("NO_UPLOAD".equals(mark)) {
+            return null;
+        }
+        try {
+
+            String basePath = fileService.getCommonFilePath(null);
+
+            fileId = ContextUtil.getTimeId(1000)
+                    + file.getFileName().substring(
+                    file.getFileName().lastIndexOf("."));
+
+            file.transferTo(new File(basePath + fileId));
+
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return fileId;
+    }
+
+
+    /**
      * applyOrderUploadProcessor#downloadApplyOrderFile 鏂囦欢涓嬭浇
      *
      * @param parameter
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml
index 8e6f18f..c946f2f 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/Archives.view.xml
@@ -417,7 +417,7 @@
 }&#xD;
 self.set(&quot;parameter&quot;,{mark: mark})&#xD;
 </ClientEvent>
-              <Property name="fileResolver">oaPR#uploadFile</Property>
+              <Property name="fileResolver">applyOrderUploadProcessor#uploadFile</Property>
               <Property name="maxFileSize">50MB</Property>
               <Property name="successMessage">闄勪欢涓婁紶鎴愬姛锛侊紒</Property>
               <Filters/>
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java b/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
index a5cf7bd..36ca071 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/OfficeAutoPR.java
@@ -229,39 +229,6 @@
         return service.delArchives(data);
     }
 
-    /**
-     * oaPR#uploadFile
-     *
-     * @param file
-     * @param parameter
-     * @return fileId 鏂版枃浠禝D鍖呭惈鏂囦欢鍚庣紑
-     */
-    @FileResolver
-    public String uploadFile(UploadFile file, Map<String, Object> parameter) {
-        String fileId = null;
-        String mark = (String) parameter.get("mark");
-        if ("NO_UPLOAD".equals(mark)) {
-            return null;
-        }
-        try {
-
-            String basePath = fileService.getCommonFilePath(null);
-
-            fileId = ContextUtil.getTimeId(1000)
-                    + file.getFileName().substring(
-                    file.getFileName().lastIndexOf("."));
-
-            file.transferTo(new File(basePath + fileId));
-
-        } catch (IllegalStateException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return fileId;
-    }
-
     // =====================璧勪骇绠＄悊=====================//
 
     /**

--
Gitblit v1.9.3