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

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

src/core/process/C_MentorFillReview.java

@@ -10,16 +10,9 @@ import java.util.Map;
 //指导老师评阅
 public class C_MentorFillReview extends TempProcess {
     public String graduationDesignId;
-    public String teacher_opinion;
     public Map<String,String> vMap;
 
     static String table="graduation_design_finished_product_mentor_score";
-    public String getTeacher_opinion() {
-        return teacher_opinion;
-    }
-    public void setTeacher_opinion(String teacher_opinion) {
-        this.teacher_opinion = teacher_opinion;
-    }
     public String getGraduationDesignId() {
         return graduationDesignId;
     }
@@ -49,7 +42,7 @@ public class C_MentorFillReview extends TempProcess {
 
     @Override
     protected boolean check() {
-        if(this.getGraduationDesignId()==null||this.getTeacher_opinion()==null||this.getVMap()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
         return false;
         else
             return true;

src/core/process/C_ReviewerFillReview.java

@@ -10,15 +10,28 @@ import java.util.Map;
 //评阅老师评阅
 public class C_ReviewerFillReview extends TempProcess {
     public String graduationDesignId;
-    public String teacher_opinion;
-    public Map<String,String> vMap;
+    public Map<String, String> vMap;
+    static String table = "graduation_design_finished_product_reviewer_score";
 
-    static String table="graduation_design_finished_product_reviewer_score";
-    public String getTeacher_opinion() {
-        return teacher_opinion;
+    public void TeacherTeamFillOpeningReportOpinion() throws Exception {
+        if (!check()) throw new GExcptInit("ReviewerFillReview Attrs init error!");
+        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());
+        vMap.put("reviewer_score_date", date);
+        Map<String, String> limits = new HashMap<>();
+        limits.put("id", this.getGraduationDesignId());
+        fillInformation.addOptions("limits", limits);
+        fillInformation.execute(null);
     }
-    public void setTeacher_opinion(String teacher_opinion) {
-        this.teacher_opinion = teacher_opinion;
+
+    protected boolean check() {
+        if (this.getGraduationDesignId() == null|| this.getVMap() == null)
+            return false;
+        else
+            return true;
     }
     public String getGraduationDesignId() {
         return graduationDesignId;
@@ -32,28 +45,6 @@ public class C_ReviewerFillReview extends TempProcess {
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
-    public void TeacherTeamFillOpeningReportOpinion() throws Exception{
-        if(!check()) throw new GExcptInit("ReviewerFillReview Attrs init error!");
-        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());
-        vMap.put("reviewer_score_date",date);
-        Map<String, String>limits = new HashMap<>();
-        limits.put("id",this.getGraduationDesignId());
-        fillInformation.addOptions("limits",limits);
-        fillInformation.execute(null);
-    }
-
-
-    @Override
-    protected boolean check() {
-        if(this.getGraduationDesignId()==null||this.getTeacher_opinion()==null||this.getVMap()==null)
-            return false;
-        else
-            return true;
-    }
 }
 
 
@@ -61,8 +52,3 @@ public class C_ReviewerFillReview extends TempProcess {
 
 
 
-
-
-
-
-