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

# Conflicts:
#	GDMS.iml

.idea/artifacts/gdms_Web_exploded.xml

@@ -8,7 +8,8 @@
           <element id="module-output" name="gdms" />
         </element>
         <element id="directory" name="lib">
-          <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 9.0/lib/tomcat-jdbc.jar" />
+          <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>

.idea/libraries/lib.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="lib">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/web/WEB-INF/lib" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+    <jarDirectory url="file://$PROJECT_DIR$/web/WEB-INF/lib" recursive="false" />
+  </library>
+</component>

src/core/process/C_CollegeFillOpeningReportOpinion.java

@@ -2,13 +2,14 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_CollegeFillOpeningReportOpinion extends TempProcess{
+public class C_CollegeFillOpeningReportOpinion extends C_FillInformation{
     String graduationDesignId;
     Map<String,String> vMap;
     protected static String buttonName ="学院开题意见";
@@ -23,8 +24,7 @@ public class C_CollegeFillOpeningReportOpinion extends TempProcess{
         FillInformation fillInformation =new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
-        String date=df.format(new Date());
+        String date= Configuration.dateFormat.format(new Date());
         vMap.put("college_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());

src/core/process/C_CollegeFillScoreOpinion.java

@@ -2,13 +2,14 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_CollegeFillScoreOpinion extends TempProcess{
+public class C_CollegeFillScoreOpinion extends C_FillInformation{
 
     String graduationDesignId;
     Map<String,String> vMap;
@@ -23,8 +24,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
-        String date=df.format(new Date());
+        String date= Configuration.dateFormat.format(new Date());
         vMap.put("college_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());

src/core/process/C_FillInformation.java

@@ -0,0 +1,8 @@
+package core.process;
+
+public abstract class C_FillInformation extends TempProcess {
+    public String getJspURL(){
+        return "/home/fill_Information.jsp";
+    }
+
+}

src/core/process/C_FillSbjMsg.java

@@ -0,0 +1,8 @@
+package core.process;
+
+public abstract class C_FillSbjMsg extends TempProcess {
+    public String getJspURL(){
+        return "/home/fillSbjMsg.jsp";
+    }
+
+}

src/core/process/C_MentorFillOpeningReportOpinion.java

@@ -2,13 +2,14 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_MentorFillOpeningReportOpinion extends TempProcess{
+public class C_MentorFillOpeningReportOpinion extends C_FillInformation{
 
     String graduationDesignId;
     Map<String,String> vMap;
@@ -24,8 +25,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
-        String date=df.format(new Date());
+        String date= Configuration.dateFormat.format(new Date());
         vMap.put("mentor_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());

src/core/process/C_MentorFillReview.java

@@ -2,13 +2,14 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_MentorFillReview extends TempProcess {
+public class C_MentorFillReview extends C_FillInformation {
 
     public String  graduationDesignId;
     public Map<String,String> vMap;
@@ -24,8 +25,7 @@ public class C_MentorFillReview extends TempProcess {
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
-        String date=df.format(new Date());
+        String date= Configuration.dateFormat.format(new Date());
         vMap.put("review_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());

src/core/process/C_ReviewerFillReview.java

@@ -2,13 +2,14 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 //评阅老师评阅
-public class C_ReviewerFillReview extends TempProcess {
+public class C_ReviewerFillReview extends C_FillInformation {
     public String graduationDesignId;
     public Map<String,String> vMap;
     protected static String buttonName ="评阅老师评阅";
@@ -23,8 +24,7 @@ public class C_ReviewerFillReview extends TempProcess {
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
-        String date=df.format(new Date());
+        String date= Configuration.dateFormat.format(new Date());
         vMap.put("reviewer_score_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());

src/core/process/C_SchoolFillScoreOpinion.java

@@ -2,13 +2,14 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_SchoolFillScoreOpinion extends TempProcess {
+public class C_SchoolFillScoreOpinion extends C_FillInformation {
 
     String graduationDesignId;
     Map<String,String> vMap;
@@ -23,8 +24,7 @@ public class C_SchoolFillScoreOpinion extends TempProcess {
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
-        String date=df.format(new Date());
+        String date= Configuration.dateFormat.format(new Date());
         vMap.put("school_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());

src/core/process/C_SecretaryFillOpeningReportRecord.java

@@ -2,13 +2,14 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_SecretaryFillOpeningReportRecord extends TempProcess{
+public class C_SecretaryFillOpeningReportRecord extends C_FillInformation{
 
     String graduationDesignId;
     Map<String,String> vMap;
@@ -24,8 +25,7 @@ public class C_SecretaryFillOpeningReportRecord extends TempProcess{
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
-        String date=df.format(new Date());
+        String date= Configuration.dateFormat.format(new Date());
         vMap.put("secretary_record_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());

src/core/process/C_SecretaryFillReplyRecord.java

@@ -2,13 +2,14 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_SecretaryFillReplyRecord extends TempProcess{
+public class C_SecretaryFillReplyRecord extends C_FillInformation{
 
     String graduationDesignId;
     Map<String,String> vMap;
@@ -24,8 +25,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
-        String date=df.format(new Date());
+        String date= Configuration.dateFormat.format(new Date());
         vMap.put("secretary_record_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());

src/core/process/C_Select.java

@@ -0,0 +1,7 @@
+package core.process;
+
+public abstract class C_Select extends TempProcess {
+    public String getJspURL(){
+        return "/home/select.jsp";
+    }
+}

src/core/process/C_StudentFillGraduationDesignInformation.java

@@ -8,7 +8,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_StudentFillGraduationDesignInformation extends TempProcess{
+public class C_StudentFillGraduationDesignInformation extends C_FillSbjMsg {
     String graduationDesignId;
     Map<String,String> vMap;
     protected static String buttonName ="填写选题信息";

src/core/process/C_StudentSelectTeacher.java

@@ -9,7 +9,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class C_StudentSelectTeacher extends TempProcess {
+public class C_StudentSelectTeacher extends C_Select {
     String studentId;
     String teacherId;
     protected static String buttonName ="选择老师";

src/core/process/C_StudentUploadOpeningReport.java

@@ -7,7 +7,7 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_StudentUploadOpeningReport extends TempProcess{
+public class C_StudentUploadOpeningReport extends C_UploadFile{
     File openingReport;
     String graduationDesignId;
     protected static String buttonName ="提交开题报告";

src/core/process/C_TeacherSelectStudent.java

@@ -9,11 +9,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class C_TeacherSelectStudent extends TempProcess {
+public class C_TeacherSelectStudent extends C_Select {
     String studentId;
     String teacherId;
     protected static String buttonName ="选择学生";
-    protected static String iconURL="";
+    protected static String iconURL="../cssFile/images/select.png";
     protected static String targetURL="/home/teacher-select-student";
     protected static String info = "";
 

src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

@@ -2,13 +2,14 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
+public class C_TeacherTeamFillOpeningReportOpinion extends C_FillInformation{
 
     String graduationDesignId;
     Map<String,String> vMap;
@@ -24,8 +25,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
-        String date=df.format(new Date());
+        String date= Configuration.dateFormat.format(new Date());
         vMap.put("report_teacher_team_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());

src/core/process/C_TeacherTeamFillScoreOpinion.java

@@ -2,13 +2,14 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_TeacherTeamFillScoreOpinion extends TempProcess {
+public class C_TeacherTeamFillScoreOpinion extends C_FillInformation {
 
     protected static String buttonName = "答辩小组评分";
     protected static String iconURL="../cssFile/images/fill.png";
@@ -24,8 +25,7 @@ public class C_TeacherTeamFillScoreOpinion extends TempProcess {
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
-        String date=df.format(new Date());
+        String date= Configuration.dateFormat.format(new Date());
         vMap.put("teacher_team_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());

src/gdms/Configuration.java

@@ -1,5 +1,7 @@
 package gdms;
 
+import java.text.SimpleDateFormat;
+
 public interface Configuration {
     //file
     String filePath = "C:/Users/zhai_/Desktop/";
@@ -7,4 +9,5 @@ public interface Configuration {
     String dbUrl="jdbc:mariadb://localhost:3306/gdms";
     String dbUsername="gdms";
     String dbPassword="GDMS";
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 }