From f5a8a777a3c73f1c2a8707db5b788f6bd2779b61 Mon Sep 17 00:00:00 2001
From: wan <2499498893@qq.com>
Date: Tue, 15 Jan 2019 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/wlf'

# Conflicts:
#	src/servlet/S_StudentUploadOpeningReport.java
---
 src/core/process/C_CollegeFillScoreOpinion.java |  2 +-
 src/core/process/C_MentorFillReview.java        | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java
index a3fafe8..8b4f0d3 100644
--- a/src/core/process/C_CollegeFillScoreOpinion.java
+++ b/src/core/process/C_CollegeFillScoreOpinion.java
@@ -22,7 +22,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{
         fillInformation.addOptions("table",table);
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
         String date=df.format(new Date());
-        vMap.put("secretary_record_date",date);
+        vMap.put("college_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java
index d9a3128..52e50f5 100644
--- a/src/core/process/C_MentorFillReview.java
+++ b/src/core/process/C_MentorFillReview.java
@@ -10,16 +10,10 @@ import java.util.Map;
 
 public class C_MentorFillReview extends TempProcess {
     public String teacherID;
-    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 getTeacherID() {
         return teacherID;
     }
@@ -32,7 +26,8 @@ public class C_MentorFillReview extends TempProcess {
     public void setvMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
-    public void TeacherTeamFillOpeningReportOpinion() throws Exception{
+
+    public void teacherTeamFillOpeningReportOpinion() throws Exception{
         if(!check()) throw new GExcptInit("MentorFillReview Attrs init error!");
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
@@ -46,10 +41,9 @@ public class C_MentorFillReview extends TempProcess {
         fillInformation.execute(null);
     }
 
-
     @Override
     protected boolean check() {
-        if(this.getTeacherID().equals(null)||this.getTeacher_opinion().equals(null)||this.getvMap().equals(null))
+        if(this.getTeacherID()==null)
         return false;
         else
             return true;