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 1/6] 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;

From 5716a978e85533d97df12cb7d877ff76fa719a73 Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Tue, 15 Jan 2019 09:40:38 +0800
Subject: [PATCH 2/6] Merge remote-tracking branch 'remotes/origin/wmj' into
 wlf

# Conflicts:
#	src/core/process/C_StudentUploadOpeningReport.java
---
 src/core/process/C_ReviewerFillReview.java    | 68 +++++++++++++++++++
 ...C_TeacherTeamFillOpeningReportOpinion.java | 58 ++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 src/core/process/C_ReviewerFillReview.java
 create mode 100644 src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

diff --git a/src/core/process/C_ReviewerFillReview.java b/src/core/process/C_ReviewerFillReview.java
new file mode 100644
index 0000000..17c0fbc
--- /dev/null
+++ b/src/core/process/C_ReviewerFillReview.java
@@ -0,0 +1,68 @@
+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_ReviewerFillReview extends TempProcess {
+    public String teacherID;
+    public String teacher_opinion;
+    public Map<String,String> vMap;
+
+    static String table="graduation_design_finished_product_reviewer_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;
+    }
+    public void setTeacherID(String teacherID) {
+        this.teacherID = teacherID;
+    }
+    public Map<String, String> getvMap() {
+        return vMap;
+    }
+    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.getTeacherID());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+    }
+
+
+    @Override
+    protected boolean check() {
+        if(this.getTeacherID().equals(null)||this.getTeacher_opinion().equals(null)||this.getvMap().equals(null))
+            return false;
+        else
+            return true;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
new file mode 100644
index 0000000..1452c2a
--- /dev/null
+++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
@@ -0,0 +1,58 @@
+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 {
+    public String teacherID;
+    public String teacher_opinion;
+    public Map<String,String> vMap;
+
+    static String table="graduation_design_opening_report_opinion_record";
+    public void TeacherTeamFillOpeningReportOpinion() throws Exception{
+        if(!check()) throw new GExcptInit("TeacherTeamFillOpeningReportOpinion 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("report_teacher_team_opinion_date",date);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getTeacherID());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+    }
+
+
+    public Map<String, String> getvMap() {
+        return vMap;
+    }
+    public void setvMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
+    public String getTeacherID() {
+        return teacherID;
+    }
+    public void setTeacherID(String teacherID) {
+        this.teacherID = teacherID;
+    }
+
+    public String getTeacher_opinion() {
+        return teacher_opinion;
+    }
+    public void setTeacher_opinion(String teacher_opinion) {
+        this.teacher_opinion = teacher_opinion;
+    }
+    @Override
+    protected boolean check() {
+        if(this.getTeacherID().equals(null)||this.getTeacher_opinion().equals(null)||this.getvMap().equals(null))
+        return false;
+        else
+            return true;
+    }
+}

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

                                                 # Conflicts:
                                                 #	src/servlet/S_StudentUploadOpeningReport.java
---
 .../C_MentorFillOpeningReportOpinion.java     | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java
index 99bc66d..b8409d1 100644
--- a/src/core/process/C_MentorFillOpeningReportOpinion.java
+++ b/src/core/process/C_MentorFillOpeningReportOpinion.java
@@ -10,8 +10,7 @@ import java.util.Map;
 
 public class C_MentorFillOpeningReportOpinion extends TempProcess{
 
-    String studentId;
-    String  mentor_opinion;
+    String graduationDesignId;
     Map<String,String> vMap;
 
     static String table="graduation_design_opening_report_opinion_record";
@@ -25,30 +24,26 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{
         String date=df.format(new Date());
         vMap.put("mentor_opinion_date",date);
         Map<String, String>limits = new HashMap<>();
-        limits.put("id",this.getStudentId());
+        limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
 
     }
     protected boolean check() {
-        if(this.getMentor_opinion()==null||this.getStudentId()==null)
+        if(this.getGraduationDesignId()==null)
             return false;
         return true;
     }
-    public String getStudentId() {
-        return studentId;
+    @Override
+    public String getGraduationDesignId() {
+        return graduationDesignId;
     }
 
-    public void setStudentId(String studentId) {
-        this.studentId = studentId;
-    }
-    public String getMentor_opinion() {
-        return mentor_opinion;
+    @Override
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
     }
 
-    public void setMentor_opinion(String mentor_opinion) {
-        this.mentor_opinion = mentor_opinion;
-    }
 
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;

From 140cf87adf265a60a697e44e1fea191aa2d72b73 Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Tue, 15 Jan 2019 10:04:18 +0800
Subject: [PATCH 4/6] Merge remote-tracking branch 'remotes/origin/master' into
 wlf

# Conflicts:
#	src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
---
 src/core/process/C_MentorFillReview.java      | 20 +++++++++----------
 src/core/process/C_ReviewerFillReview.java    | 20 +++++++++----------
 ...C_TeacherTeamFillOpeningReportOpinion.java | 15 ++++++--------
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java
index d9a3128..47db12d 100644
--- a/src/core/process/C_MentorFillReview.java
+++ b/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;
diff --git a/src/core/process/C_ReviewerFillReview.java b/src/core/process/C_ReviewerFillReview.java
index 17c0fbc..abec89e 100644
--- a/src/core/process/C_ReviewerFillReview.java
+++ b/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;
diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
index cc0bf06..389d8bd 100644
--- a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
+++ b/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;}
 }

From 2268a18d5870536d42768aa111031c470d30dc93 Mon Sep 17 00:00:00 2001
From: wan <2499498893@qq.com>
Date: Tue, 15 Jan 2019 10:08:34 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9process?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                   |  2 +-
 src/core/process/C_CollegeFillScoreOpinion.java  |  2 +-
 .../C_MentorFillOpeningReportOpinion.java        | 11 +++++++++++
 src/core/process/C_MentorFillReview.java         | 16 +++++++++-------
 src/core/process/C_SchoolFillScoreOpinion.java   |  6 +++++-
 .../C_SecretaryFillOpeningReportOpinion.java     |  5 ++++-
 src/core/process/C_SecretaryFillReplyRecord.java |  5 ++++-
 ...C_StudentFillGraduationDesignInformation.java |  6 +++++-
 .../C_TeacherTeamFillOpeningReportOpinion.java   |  7 ++++++-
 .../process/C_TeacherTeamFillScoreOpinion.java   |  6 ++++--
 10 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9486b47..df60b67 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java
index 96e4e7d..9ee4154 100644
--- a/src/core/process/C_CollegeFillScoreOpinion.java
+++ b/src/core/process/C_CollegeFillScoreOpinion.java
@@ -30,7 +30,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{
 
     }
     protected boolean check() {
-        if(this.getGraduationDesignId()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
             return false;
         return true;
     }
diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java
index 139904e..4f7e959 100644
--- a/src/core/process/C_MentorFillOpeningReportOpinion.java
+++ b/src/core/process/C_MentorFillOpeningReportOpinion.java
@@ -10,6 +10,7 @@ import java.util.Map;
 
 public class C_MentorFillOpeningReportOpinion extends TempProcess{
 
+    String graduationDesignId;
     Map<String,String> vMap;
 
     static String table="graduation_design_opening_report_opinion_record";
@@ -33,6 +34,16 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{
             return false;
         return true;
     }
+    @Override
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
+
+    @Override
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
+    }
+
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java
index 52e50f5..9339aa9 100644
--- a/src/core/process/C_MentorFillReview.java
+++ b/src/core/process/C_MentorFillReview.java
@@ -20,12 +20,8 @@ public class C_MentorFillReview extends TempProcess {
     public void setTeacherID(String teacherID) {
         this.teacherID = teacherID;
     }
-    public Map<String, String> getvMap() {
-        return vMap;
-    }
-    public void setvMap(Map<String, String> vMap) {
-        this.vMap = vMap;
-    }
+
+
 
     public void teacherTeamFillOpeningReportOpinion() throws Exception{
         if(!check()) throw new GExcptInit("MentorFillReview Attrs init error!");
@@ -43,10 +39,16 @@ public class C_MentorFillReview extends TempProcess {
 
     @Override
     protected boolean check() {
-        if(this.getTeacherID()==null)
+        if(this.getTeacherID()==null||this.getVMap()==null)
         return false;
         else
             return true;
     }
+    public void setVMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
+    public Map<String, String> getVMap() {
+        return vMap;
+    }
 }
 
diff --git a/src/core/process/C_SchoolFillScoreOpinion.java b/src/core/process/C_SchoolFillScoreOpinion.java
index 652cf1b..48d3112 100644
--- a/src/core/process/C_SchoolFillScoreOpinion.java
+++ b/src/core/process/C_SchoolFillScoreOpinion.java
@@ -28,7 +28,7 @@ public class C_SchoolFillScoreOpinion extends TempProcess {
         fillInformation.execute(null);
     }
     protected boolean check() {
-        if(this.getGraduationDesignId()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
             return false;
         return true;
     }
@@ -45,6 +45,10 @@ public class C_SchoolFillScoreOpinion extends TempProcess {
         this.vMap = vMap;
     }
 
+    public Map<String, String> getVMap() {
+        return vMap;
+    }
+
 }
 
 
diff --git a/src/core/process/C_SecretaryFillOpeningReportOpinion.java b/src/core/process/C_SecretaryFillOpeningReportOpinion.java
index d0398a3..7bad03a 100644
--- a/src/core/process/C_SecretaryFillOpeningReportOpinion.java
+++ b/src/core/process/C_SecretaryFillOpeningReportOpinion.java
@@ -29,7 +29,7 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{
         fillInformation.execute(null);
     }
     protected boolean check() {
-        if(this.getGraduationDesignId()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
             return false;
         return true;
     }
@@ -46,5 +46,8 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
+    public Map<String, String> getVMap() {
+        return vMap;
+    }
 
 }
diff --git a/src/core/process/C_SecretaryFillReplyRecord.java b/src/core/process/C_SecretaryFillReplyRecord.java
index 0c8c478..86eacbd 100644
--- a/src/core/process/C_SecretaryFillReplyRecord.java
+++ b/src/core/process/C_SecretaryFillReplyRecord.java
@@ -30,7 +30,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{
 
     }
     protected boolean check() {
-        if(this.getGraduationDesignId()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
             return false;
         return true;
     }
@@ -46,6 +46,9 @@ public class C_SecretaryFillReplyRecord extends TempProcess{
         this.vMap = vMap;
     }
 
+    public Map<String, String> getVMap() {
+        return vMap;
+    }
 
 
 }
diff --git a/src/core/process/C_StudentFillGraduationDesignInformation.java b/src/core/process/C_StudentFillGraduationDesignInformation.java
index 33e6df4..49fe875 100644
--- a/src/core/process/C_StudentFillGraduationDesignInformation.java
+++ b/src/core/process/C_StudentFillGraduationDesignInformation.java
@@ -25,7 +25,7 @@ public class C_StudentFillGraduationDesignInformation extends TempProcess{
         fillInformation.execute(null);
     }
     protected boolean check() {
-        if(this.getGraduationDesignId()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
             return false;
         return true;
     }
@@ -43,5 +43,9 @@ public class C_StudentFillGraduationDesignInformation extends TempProcess{
         this.vMap = vMap;
     }
 
+    public Map<String, String> getVMap() {
+        return vMap;
+    }
+
 
 }
\ No newline at end of file
diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
index cc0bf06..c0df89b 100644
--- a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
+++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java
@@ -29,7 +29,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
         fillInformation.execute(null);
     }
     protected boolean check() {
-        if(this.getGraduationDesignId()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
             return false;
         return true;
     }
@@ -47,4 +47,9 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
         this.vMap = vMap;
     }
 
+    public Map<String, String> getVMap() {
+        return vMap;
+    }
+
+
 }
diff --git a/src/core/process/C_TeacherTeamFillScoreOpinion.java b/src/core/process/C_TeacherTeamFillScoreOpinion.java
index e87c937..6e641da 100644
--- a/src/core/process/C_TeacherTeamFillScoreOpinion.java
+++ b/src/core/process/C_TeacherTeamFillScoreOpinion.java
@@ -29,7 +29,7 @@ public class C_TeacherTeamFillScoreOpinion extends TempProcess {
         fillInformation.execute(null);
     }
     protected boolean check() {
-        if(this.getGraduationDesignId()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
             return false;
         return true;
     }
@@ -45,5 +45,7 @@ public class C_TeacherTeamFillScoreOpinion extends TempProcess {
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
-
+    public Map<String, String> getVMap() {
+        return vMap;
+    }
 }

From e7ff9864bb466da72369753e396a945ecbf3ca8e Mon Sep 17 00:00:00 2001
From: wan <2499498893@qq.com>
Date: Tue, 15 Jan 2019 15:22:44 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E7=9A=84process?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/artifacts/GDMS_war_exploded.xml      |  4 ++-
 GDMS.iml                                   | 30 ++++++++++++++++---
 src/core/process/C_MentorFillReview.java   | 22 +++++++-------
 src/core/process/C_ReviewerFillReview.java | 35 +++++++++-------------
 4 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml
index 1d55d9c..d1033ca 100644
--- a/.idea/artifacts/GDMS_war_exploded.xml
+++ b/.idea/artifacts/GDMS_war_exploded.xml
@@ -6,10 +6,12 @@
       <element id="directory" name="WEB-INF">
         <element id="directory" name="classes">
           <element id="module-output" name="GDMS" />
+          <element id="dir-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5" />
         </element>
         <element id="directory" name="lib">
           <element id="library" level="project" name="lib" />
-          <element id="library" level="project" name="tomcat-lib" />
+          <element id="extracted-dir" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar" path-in-jar="/" />
+          <element id="file-copy" path="C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar" />
         </element>
       </element>
     </root>
diff --git a/GDMS.iml b/GDMS.iml
index 20dda90..8e4eff1 100644
--- a/GDMS.iml
+++ b/GDMS.iml
@@ -9,18 +9,40 @@
         <webroots>
           <root url="file://$MODULE_DIR$/web" relative="/" />
         </webroots>
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src" />
+        </sourceRoots>
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
+    <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" scope="PROVIDED" name="lib" level="project" />
+    <orderEntry type="library" exported="" scope="PROVIDED" name="tomcat-lib" level="project" />
+    <orderEntry type="module-library" exported="" scope="PROVIDED">
+      <library>
+        <CLASSES>
+          <root url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5/webapps/docs/appdev/sample/src" />
+          <root url="file://C:/Program Files/Apache Software Foundation/Tomcat 8.5/work/Catalina/localhost/ROOT" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="library" exported="" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
-    <orderEntry type="library" scope="PROVIDED" name="tomcat-lib" level="project" />
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://C:/Program Files/Apache Software Foundation/Tomcat 8.5/lib/tomcat-jdbc.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file
diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java
index 9339aa9..28077b9 100644
--- a/src/core/process/C_MentorFillReview.java
+++ b/src/core/process/C_MentorFillReview.java
@@ -9,19 +9,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class C_MentorFillReview extends TempProcess {
-    public String teacherID;
+
+    public String  graduationDesignId;
     public Map<String,String> vMap;
 
     static String table="graduation_design_finished_product_mentor_score";
 
-    public String getTeacherID() {
-        return teacherID;
-    }
-    public void setTeacherID(String teacherID) {
-        this.teacherID = teacherID;
-    }
-
-
 
     public void teacherTeamFillOpeningReportOpinion() throws Exception{
         if(!check()) throw new GExcptInit("MentorFillReview Attrs init error!");
@@ -32,18 +25,25 @@ 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);
     }
 
     @Override
     protected boolean check() {
-        if(this.getTeacherID()==null||this.getVMap()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
         return false;
         else
             return true;
     }
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
+
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
+    }
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
diff --git a/src/core/process/C_ReviewerFillReview.java b/src/core/process/C_ReviewerFillReview.java
index abec89e..d81556e 100644
--- a/src/core/process/C_ReviewerFillReview.java
+++ b/src/core/process/C_ReviewerFillReview.java
@@ -10,28 +10,10 @@ import java.util.Map;
 //评阅老师评阅
 public class C_ReviewerFillReview extends TempProcess {
     public String graduationDesignId;
-    public String teacher_opinion;
     public Map<String,String> vMap;
 
     static String table="graduation_design_finished_product_reviewer_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;
-    }
-    public void setGraduationDesignId(String teacherID) {
-        this.graduationDesignId = graduationDesignId;
-    }
-    public Map<String, String> getVMap() {
-        return vMap;
-    }
-    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();
@@ -46,14 +28,25 @@ public class C_ReviewerFillReview extends TempProcess {
         fillInformation.execute(null);
     }
 
-
     @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;
     }
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
+    public void setGraduationDesignId(String teacherID) {
+        this.graduationDesignId = graduationDesignId;
+    }
+    public Map<String, String> getVMap() {
+        return vMap;
+    }
+    public void setVMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
 }