From 20058dd88ffa3814a77d31887ade9c7bd2b7fb6e Mon Sep 17 00:00:00 2001
From: zhai_lw <zhai_lw@outlook.com>
Date: Wed, 16 Jan 2019 10:50:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/hechu1'

# Conflicts:
#	.idea/artifacts/gdms_war_exploded.xml
#	GDMS.iml
---
 .idea/artifacts/GDMS_war_exploded.xml           |  0
 .idea/artifacts/gdms_Web_exploded.xml           | 17 +++++++++++++++++
 src/core/process/C_FillInformation.java         |  1 -
 .../process/C_StudentUploadFinishedProduct.java |  5 +++++
 .../process/C_StudentUploadOpeningReport.java   |  6 ++++++
 src/core/process/C_UploadFile.java              |  1 +
 src/core/process/TempProcess.java               |  6 ++++++
 7 files changed, 35 insertions(+), 1 deletion(-)
 delete mode 100644 .idea/artifacts/GDMS_war_exploded.xml
 create mode 100644 .idea/artifacts/gdms_Web_exploded.xml

diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml
deleted file mode 100644
index e69de29..0000000
diff --git a/.idea/artifacts/gdms_Web_exploded.xml b/.idea/artifacts/gdms_Web_exploded.xml
new file mode 100644
index 0000000..670580d
--- /dev/null
+++ b/.idea/artifacts/gdms_Web_exploded.xml
@@ -0,0 +1,17 @@
+<component name="ArtifactManager">
+  <artifact type="exploded-war" name="gdms:Web exploded">
+    <output-path>$PROJECT_DIR$/out/artifacts/gdms_Web_exploded</output-path>
+    <root id="root">
+      <element id="javaee-facet-resources" facet="GDMS/web/Web" />
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="gdms" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar" />
+          <element id="library" level="project" name="lib" />
+        </element>
+      </element>
+    </root>
+  </artifact>
+</component>
\ No newline at end of file
diff --git a/src/core/process/C_FillInformation.java b/src/core/process/C_FillInformation.java
index d498a9b..ee91fdb 100644
--- a/src/core/process/C_FillInformation.java
+++ b/src/core/process/C_FillInformation.java
@@ -4,5 +4,4 @@ public abstract class C_FillInformation extends TempProcess {
     public String getJspURL(){
         return "/home/fill_Information.jsp";
     }
-
 }
diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java
index 8ebd9ff..a97cbaa 100644
--- a/src/core/process/C_StudentUploadFinishedProduct.java
+++ b/src/core/process/C_StudentUploadFinishedProduct.java
@@ -68,4 +68,9 @@ public class C_StudentUploadFinishedProduct extends C_UploadFile {
     public String getButtonName() {
         return buttonName;
     }
+
+    @Override
+    public String getFileType() {
+        return "上传定稿";
+    }
 }
diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java
index 5a95b63..6887054 100644
--- a/src/core/process/C_StudentUploadOpeningReport.java
+++ b/src/core/process/C_StudentUploadOpeningReport.java
@@ -26,6 +26,7 @@ public class C_StudentUploadOpeningReport extends C_UploadFile{
         limits.put("id",this.getGraduationDesignId());
         uploadFileOperation.addOptions("limits",limits);
         uploadFileOperation.execute(null);
+        updateStatus();
     }
 
     protected boolean check() {
@@ -69,4 +70,9 @@ public class C_StudentUploadOpeningReport extends C_UploadFile{
     public String getButtonName() {
         return buttonName;
     }
+
+    @Override
+    public String getFileType() {
+        return "上传开题报告";
+    }
 }
diff --git a/src/core/process/C_UploadFile.java b/src/core/process/C_UploadFile.java
index 4593b24..dd27154 100644
--- a/src/core/process/C_UploadFile.java
+++ b/src/core/process/C_UploadFile.java
@@ -4,4 +4,5 @@ public abstract class C_UploadFile extends TempProcess {
     public String getJspURL(){
         return "/home/upload_file.jsp";
     }
+    public abstract String getFileType();
 }
diff --git a/src/core/process/TempProcess.java b/src/core/process/TempProcess.java
index 2675bff..764fa8d 100644
--- a/src/core/process/TempProcess.java
+++ b/src/core/process/TempProcess.java
@@ -4,6 +4,8 @@ public abstract class TempProcess extends Process {
     private static String process;
     private static String nextProcess;
     private String graduationDesignId;
+    private static String table;
+    private static String fileds;
 
     public String getGraduationDesignId() {
         return graduationDesignId;
@@ -28,4 +30,8 @@ public abstract class TempProcess extends Process {
     public static void setNextProcess(String nextProcess) {
         TempProcess.nextProcess = nextProcess;
     }
+
+    public static void updateStatus(){
+        ;
+    }
 }