Merge remote-tracking branch 'remotes/origin/master' into hechu1

# Conflicts:
#	.idea/artifacts/GDMS_war_exploded.xml

.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>

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";
     }
-
 }

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 "上传定稿";
+    }
 }

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 "上传开题报告";
+    }
 }

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();
 }

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(){
+        ;
+    }
 }