Merge remote-tracking branch 'remotes/origin/wmj' into zgl

# Conflicts:
#	.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml

.idea/artifacts/GDMS_war_exploded.xml

@@ -1,13 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="gdms:war exploded">
-    <output-path>$PROJECT_DIR$/out/artifacts/gdms_war_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>
-    </root>
-  </artifact>
-</component>

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

src/dao/DBManagement.java

@@ -28,6 +28,7 @@ public class DBManagement {
         "graduation_design_opening_report_opinion_record",
         "graduation_design_reply",
         "graduation_design_reply_opinion_record_score"
+
     };
     public static String[] studentInfo = {
             "id",
@@ -90,7 +91,22 @@ public class DBManagement {
     public static Map<String,String> allStatus = new HashMap<>(){
         {
             put("graduation_design","teacher_choose_student_status");
-            put("graduation_design","");
+            put("graduation_design","student_choose_teacher_status");
+            put("graduation_design_information","student_fill_graduation_design_information_status");
+            put("graduation_design_opening_report","opening_report_status");
+            put("graduation_design_opening_report_opinion_record","opening_report_mentor_opinion_status");
+            put("graduation_design_opening_report_opinion_record","opening_report_teacher_team_opinion_status");
+            put("graduation_design_opening_report_opinion_record","opening_report_college_opinion_status");
+            put("graduation_design_opening_report_opinion_record","opening_report_secretary_record_status");
+            put("graduation_design_finished_product","finished_product_status");
+            put("graduation_design_finished_product_mentor_score","finished_product_mentor_score_status");
+            put("graduation_design_finished_product_reviewer_score","finished_product_reviewer_score_status");
+            put("graduation_design_reply_opinion_record_score","reply_ secretary_record_status");
+            put("graduation_design_reply_opinion_record_score","reply_ teacher_team_score_status");
+            put("graduation_design_reply_opinion_record_score","reply_college_score_status");
+            put("graduation_design_reply_opinion_record_score","reply_school_score_status");
+
+
         }
     };
     public static String driverClassName="org.mariadb.jdbc.Driver";