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

# Conflicts:
#	src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

src/core/process/C_MentorFillReview.java

@@ -7,9 +7,9 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-
+//指导老师评阅
 public class C_MentorFillReview extends TempProcess {
-    public String teacherID;
+    public String graduationDesignId;
     public String teacher_opinion;
     public Map<String,String> vMap;
 
@@ -20,16 +20,16 @@ public class C_MentorFillReview extends TempProcess {
     public void setTeacher_opinion(String teacher_opinion) {
         this.teacher_opinion = teacher_opinion;
     }
-    public String getTeacherID() {
-        return teacherID;
+    public String getGraduationDesignId() {
+        return graduationDesignId;
     }
-    public void setTeacherID(String teacherID) {
-        this.teacherID = teacherID;
+    public void setGraduationDesignId(String teacherID) {
+        this.graduationDesignId = graduationDesignId;
     }
-    public Map<String, String> getvMap() {
+    public Map<String, String> getVMap() {
         return vMap;
     }
-    public void setvMap(Map<String, String> vMap) {
+    public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
     public void TeacherTeamFillOpeningReportOpinion() throws Exception{
@@ -41,7 +41,7 @@ public class C_MentorFillReview extends TempProcess {
         String date=df.format(new Date());
         vMap.put("review_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
-        limits.put("id",this.getTeacherID());
+        limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
     }
@@ -49,7 +49,7 @@ public class C_MentorFillReview extends TempProcess {
 
     @Override
     protected boolean check() {
-        if(this.getTeacherID().equals(null)||this.getTeacher_opinion().equals(null)||this.getvMap().equals(null))
+        if(this.getGraduationDesignId()==null||this.getTeacher_opinion()==null||this.getVMap()==null)
         return false;
         else
             return true;

src/core/process/C_ReviewerFillReview.java

@@ -7,9 +7,9 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-
+//评阅老师评阅
 public class C_ReviewerFillReview extends TempProcess {
-    public String teacherID;
+    public String graduationDesignId;
     public String teacher_opinion;
     public Map<String,String> vMap;
 
@@ -20,16 +20,16 @@ public class C_ReviewerFillReview extends TempProcess {
     public void setTeacher_opinion(String teacher_opinion) {
         this.teacher_opinion = teacher_opinion;
     }
-    public String getTeacherID() {
-        return teacherID;
+    public String getGraduationDesignId() {
+        return graduationDesignId;
     }
-    public void setTeacherID(String teacherID) {
-        this.teacherID = teacherID;
+    public void setGraduationDesignId(String teacherID) {
+        this.graduationDesignId = graduationDesignId;
     }
-    public Map<String, String> getvMap() {
+    public Map<String, String> getVMap() {
         return vMap;
     }
-    public void setvMap(Map<String, String> vMap) {
+    public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
     public void TeacherTeamFillOpeningReportOpinion() throws Exception{
@@ -41,7 +41,7 @@ public class C_ReviewerFillReview extends TempProcess {
         String date=df.format(new Date());
         vMap.put("reviewer_score_date",date);
         Map<String, String>limits = new HashMap<>();
-        limits.put("id",this.getTeacherID());
+        limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
     }
@@ -49,7 +49,7 @@ public class C_ReviewerFillReview extends TempProcess {
 
     @Override
     protected boolean check() {
-        if(this.getTeacherID().equals(null)||this.getTeacher_opinion().equals(null)||this.getvMap().equals(null))
+        if(this.getGraduationDesignId()==null||this.getTeacher_opinion()==null||this.getVMap()==null)
             return false;
         else
             return true;

src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

@@ -2,12 +2,11 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
-
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-
+//开题报告会小组组长提交开题报告会纪要意见
 public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
 
     String graduationDesignId;
@@ -33,18 +32,16 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
             return false;
         return true;
     }
-    @Override
-    public String getGraduationDesignId() {
-        return graduationDesignId;
-    }
-
     @Override
     public void setGraduationDesignId(String graduationDesignId) {
         this.graduationDesignId = graduationDesignId;
     }
-
+    @Override
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
-
+    public Map<String, String> getVMap(){return vMap;}
 }