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

# Conflicts:
#	src/core/process/C_CollegeFillScoreOpinion.java
#	src/core/process/C_MentorFillOpeningReportOpinion.java
#	src/core/process/C_MentorFillReview.java
#	src/core/process/C_ReviewerFillReview.java
#	src/core/process/C_SchoolFillScoreOpinion.java
#	src/core/process/C_SecretaryFillOpeningReportRecord.java
#	src/core/process/C_SecretaryFillReplyRecord.java
#	src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
#	src/core/process/C_TeacherTeamFillScoreOpinion.java

src/core/process/C_CollegeFillOpeningReportOpinion.java

@@ -5,11 +5,10 @@ import dao.DBManagement;
 import error.GExcptInit;
 import error.GExcptSQL;
 import gdms.Configuration;
+import org.apache.commons.lang.ObjectUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Map;
 
 public class C_CollegeFillOpeningReportOpinion extends C_FillInformation{
     String graduationDesignId;
@@ -79,4 +78,11 @@ public class C_CollegeFillOpeningReportOpinion extends C_FillInformation{
     public String getButtonName() {
         return buttonName;
     }
+
+    public List<String> getInputName() {
+        List<String> ls = new ArrayList<>();
+        ls.add("college_opinion");
+        ls.add(null);
+        return ls;
+    }
 }

src/core/process/C_CollegeFillScoreOpinion.java

@@ -7,9 +7,7 @@ import error.GExcptSQL;
 import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Map;
 
 public class C_CollegeFillScoreOpinion extends C_FillInformation{
 
@@ -74,4 +72,12 @@ public class C_CollegeFillScoreOpinion extends C_FillInformation{
     public void updateStatus() throws GExcptSQL {
         core.process.Utils.updateStatus(graduationDesignId,table,fileds);
     }
+
+    @Override
+    public List<String> getInputName() {
+        List<String> ls = new ArrayList<>();
+        ls.add("college_opinion");
+        ls.add("college_score");
+        return ls;
+    }
 }

src/core/process/C_FillInformation.java

@@ -1,7 +1,10 @@
 package core.process;
 
+import java.util.List;
+
 public abstract class C_FillInformation extends TempProcess {
     public String getJspURL(){
         return "/home/fill_Information.jsp";
     }
+    public abstract List<String> getInputName();
 }

src/core/process/C_MentorFillOpeningReportOpinion.java

@@ -5,6 +5,8 @@ import error.GExcptInit;
 import error.GExcptSQL;
 import gdms.Configuration;
 
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -81,4 +83,11 @@ public class C_MentorFillOpeningReportOpinion extends C_FillInformation{
     public String getButtonName() {
         return buttonName;
     }
+
+    public List<String> getInputName() {
+        List<String> ls = new ArrayList<>();
+        ls.add("mentor_opinion");
+        ls.add(null);
+        return ls;
+    }
 }

src/core/process/C_MentorFillReview.java

@@ -8,6 +8,8 @@ import gdms.Configuration;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 public class C_MentorFillReview extends C_FillInformation {
 
@@ -81,5 +83,12 @@ public class C_MentorFillReview extends C_FillInformation {
     public String getButtonName() {
         return buttonName;
     }
+
+    public List<String> getInputName() {
+        List<String> ls = new ArrayList<>();
+        ls.add("review_opinion");
+        ls.add("total_grade");
+        return ls;
+    }
 }
 

src/core/process/C_ReviewerFillReview.java

@@ -5,9 +5,7 @@ import error.GExcptInit;
 import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Map;
 //评阅老师评阅
 public class C_ReviewerFillReview extends C_FillInformation {
     public String graduationDesignId;
@@ -78,6 +76,13 @@ public class C_ReviewerFillReview extends C_FillInformation {
     public String getButtonName() {
         return buttonName;
     }
+
+    public List<String> getInputName() {
+        List<String> ls = new ArrayList<>();
+        ls.add("opinion");
+        ls.add("score");
+        return ls;
+    }
 }
 
 

src/core/process/C_SchoolFillScoreOpinion.java

@@ -5,9 +5,7 @@ import error.GExcptInit;
 import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Map;
 
 public class C_SchoolFillScoreOpinion extends C_FillInformation {
 
@@ -81,6 +79,13 @@ public class C_SchoolFillScoreOpinion extends C_FillInformation {
     public String getButtonName() {
         return buttonName;
     }
+
+    public List<String> getInputName() {
+        List<String> ls = new ArrayList<>();
+        ls.add("school_opinion");
+        ls.add("school_score");
+        return ls;
+    }
 }
 
 

src/core/process/C_SecretaryFillOpeningReportRecord.java

@@ -5,9 +5,7 @@ import error.GExcptInit;
 import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Map;
 
 public class C_SecretaryFillOpeningReportRecord extends C_FillInformation{
 
@@ -80,4 +78,11 @@ public class C_SecretaryFillOpeningReportRecord extends C_FillInformation{
     public String getButtonName() {
         return buttonName;
     }
+
+    public List<String> getInputName() {
+        List<String> ls = new ArrayList<>();
+        ls.add("secretary_record");
+        ls.add(null);
+        return ls;
+    }
 }

src/core/process/C_SecretaryFillReplyRecord.java

@@ -5,9 +5,7 @@ import error.GExcptInit;
 import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Map;
 
 public class C_SecretaryFillReplyRecord extends C_FillInformation{
 
@@ -81,4 +79,11 @@ public class C_SecretaryFillReplyRecord extends C_FillInformation{
     public String getButtonName() {
         return buttonName;
     }
+
+    public List<String> getInputName() {
+        List<String> ls = new ArrayList<>();
+        ls.add("secretary_record");
+        ls.add(null);
+        return ls;
+    }
 }

src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

@@ -5,9 +5,7 @@ import error.GExcptInit;
 import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Map;
 
 public class C_TeacherTeamFillOpeningReportOpinion extends C_FillInformation{
 
@@ -82,4 +80,11 @@ public class C_TeacherTeamFillOpeningReportOpinion extends C_FillInformation{
         return buttonName;
     }
 
+    public List<String> getInputName() {
+        List<String> ls = new ArrayList<>();
+        ls.add("report_teacher_team_opinion");
+        ls.add(null);
+        return ls;
+    }
+
 }

src/core/process/C_TeacherTeamFillScoreOpinion.java

@@ -5,9 +5,7 @@ import error.GExcptInit;
 import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.Map;
 
 public class C_TeacherTeamFillScoreOpinion extends C_FillInformation {
 
@@ -83,4 +81,11 @@ public class C_TeacherTeamFillScoreOpinion extends C_FillInformation {
     public Map<String, String> getVMap() {
         return vMap;
     }
+
+    public List<String> getInputName() {
+        List<String> ls = new ArrayList<>();
+        ls.add("teacher_team_opinion");
+        ls.add("teacher_team_score");
+        return ls;
+    }
 }