Merge remote-tracking branch 'origin/master'

src/core/process/C_CollegeFillOpeningReportOpinion.java

@@ -10,7 +10,6 @@ import java.util.Map;
 
 public class C_CollegeFillOpeningReportOpinion extends TempProcess{
     String graduationDesignId;
-    String opening_report_college_teacher_id;
     Map<String,String> vMap;
 
     static  String table="graduation_design_opening_report_opinion_record";
@@ -29,7 +28,7 @@ public class C_CollegeFillOpeningReportOpinion extends TempProcess{
         fillInformation.execute(null);
     }
     protected boolean check() {
-        if(this.getOpening_report_college_teacher_id()==null||this.getGraduationDesignId()==null)
+        if(this.getGraduationDesignId()==null||this.getVMap()==null)
             return false;
         return true;
     }
@@ -41,16 +40,11 @@ public class C_CollegeFillOpeningReportOpinion extends TempProcess{
         this.graduationDesignId = graduationDesignId;
     }
 
-    public String getOpening_report_college_teacher_id() {
-        return opening_report_college_teacher_id;
-    }
-
-    public void setOpening_report_college_teacher_id(String opening_report_college_teacher_id) {
-        this.opening_report_college_teacher_id = opening_report_college_teacher_id;
-    }
-
-    public void setvMap(Map<String, String> vMap) {
+    public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
 
+    public Map<String, String> getVMap() {
+        return vMap;
+    }
 }

src/core/process/C_CollegeFillScoreOpinion.java

@@ -16,7 +16,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{
     static  String table="graduation_design_reply_opinion_record_score";
 
     public void fillInformation() throws Exception{
-        if(!check()) throw new GExcptInit("FillInformations Attrs Init error!");
+        if(!check()) throw new GExcptInit("FillInformation Attrs Init error!");
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);

src/core/process/C_MentorFillOpeningReportOpinion.java

@@ -50,7 +50,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{
         this.mentor_opinion = mentor_opinion;
     }
 
-    public void setvMap(Map<String, String> vMap) {
+    public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
 }

src/core/process/C_SchoolFillScoreOpinion.java

@@ -41,7 +41,7 @@ public class C_SchoolFillScoreOpinion extends TempProcess {
     public void setGraduationDesignId(String graduationDesignId) {
         this.graduationDesignId = graduationDesignId;
     }
-    public void setvMap(Map<String, String> vMap) {
+    public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
 

src/core/process/C_SecretaryFillOpeningReportOpinion.java

@@ -43,7 +43,7 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{
         this.graduationDesignId = graduationDesignId;
     }
 
-    public void setvMap(Map<String, String> vMap) {
+    public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
 

src/core/process/C_SecretaryFillReplyRecord.java

@@ -16,7 +16,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{
     static  String table="graduation_design_reply_opinion_record_score";
 
     public void fillInformation() throws Exception{
-        if(!check()) throw new GExcptInit("FillInformations Attrs Init error!");
+        if(!check()) throw new GExcptInit("FillInformation Attrs Init error!");
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
@@ -42,7 +42,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{
         this.graduationDesignId = graduationDesignId;
     }
 
-    public void setvMap(Map<String, String> vMap) {
+    public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
 

src/core/process/C_StudentFillGraduationDesignInformation.java

@@ -39,7 +39,7 @@ public class C_StudentFillGraduationDesignInformation extends TempProcess{
         this.graduationDesignId = graduationDesignId;
     }
 
-    public void setvMap(Map<String, String> vMap) {
+    public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
 

src/core/process/C_StudentUploadFinishedProduct.java

@@ -10,7 +10,7 @@ import java.util.Map;
 public class C_StudentUploadFinishedProduct {
 
     File finishedProduct;
-    String gaduationDesignId;
+    String graduationDesignId;
 
     static String file_type = "finished_product";
     public void uploadOpeningReport() throws Exception{
@@ -20,13 +20,13 @@ public class C_StudentUploadFinishedProduct {
         uploadFile.addOptions("file",this.getFinishedProduct());
         uploadFile.addOptions("file_type",file_type);
         Map<String, String>limits = new HashMap<>();
-        limits.put("id",this.getGaduationDesignId());
+        limits.put("id",this.getGraduationDesignId());
         uploadFile.addOptions("limits",limits);
         uploadFile.execute(null);
     }
 
     protected boolean check() {
-        if(this.getFinishedProduct()==null||this.getGaduationDesignId()==null)
+        if(this.getFinishedProduct()==null||this.getGraduationDesignId()==null)
             return false;
         return true;
     }
@@ -37,12 +37,12 @@ public class C_StudentUploadFinishedProduct {
     public void setFinishedProduct(File finishedProduct) {
         this.finishedProduct = finishedProduct;
     }
-    public String getGaduationDesignId() {
-        return gaduationDesignId;
+    public String getGraduationDesignId() {
+        return graduationDesignId;
     }
 
-    public void setGaduationDesignId(String gaduationDesignId) {
-        this.gaduationDesignId = gaduationDesignId;
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
     }
 
 }

src/core/process/C_StudentUploadOpeningReport.java

@@ -9,7 +9,7 @@ import java.util.Map;
 
 public class C_StudentUploadOpeningReport extends TempProcess{
     File openingReport;
-    String gaduationDesignId;
+    String graduationDesignId;
 
     static String file_type = "opening_report";
 
@@ -20,13 +20,13 @@ public class C_StudentUploadOpeningReport extends TempProcess{
         uploadFileOperation.addOptions("file",this.getOpeningReport());
         uploadFileOperation.addOptions("file_type",file_type);
         Map<String, String>limits = new HashMap<>();
-        limits.put("id",this.getGaduationDesignId());
+        limits.put("id",this.getGraduationDesignId());
         uploadFileOperation.addOptions("limits",limits);
         uploadFileOperation.execute(null);
     }
 
     protected boolean check() {
-        if(this.getGaduationDesignId()==null||this.getOpeningReport()==null)
+        if(this.getGraduationDesignId()==null||this.getOpeningReport()==null)
             return false;
         return true;
     }
@@ -39,11 +39,11 @@ public class C_StudentUploadOpeningReport extends TempProcess{
         this.openingReport = openingReport;
     }
 
-    public String getGaduationDesignId() {
-        return gaduationDesignId;
+    public String getGraduationDesignId() {
+        return graduationDesignId;
     }
 
-    public void setGaduationDesignId(String gaduationDesignId) {
-        this.gaduationDesignId = gaduationDesignId;
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
     }
 }

src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

@@ -43,7 +43,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
         this.graduationDesignId = graduationDesignId;
     }
 
-    public void setvMap(Map<String, String> vMap) {
+    public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
 

src/core/process/C_TeacherTeamFillScoreOpinion.java

@@ -42,7 +42,7 @@ public class C_TeacherTeamFillScoreOpinion extends TempProcess {
     public void setGraduationDesignId(String graduationDesignId) {
         this.graduationDesignId = graduationDesignId;
     }
-    public void setvMap(Map<String, String> vMap) {
+    public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }
 

src/servlet/S_CollegeFillOpeningReportOpinion.java

@@ -1,5 +1,7 @@
 package servlet;
 
+import core.process.C_CollegeFillOpeningReportOpinion;
+
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -8,14 +10,22 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet(name = "S_CollegeFillOpeningReportOpinion")
+@WebServlet("college-fill-opening-report-opinion")
 public class S_CollegeFillOpeningReportOpinion extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
         Map<String,String> vMap = servlet.Utils.getVMap(vName,request);
-
+        C_CollegeFillOpeningReportOpinion p =new C_CollegeFillOpeningReportOpinion();
+        p.setGraduationDesignId(id);
+        p.setVMap(vMap);
+        try {
+            p.fillInformation();
+        } catch (Exception e) {
+            e.printStackTrace();
+            response.sendRedirect("/op_fail.jsp");
+        }
     }
     static String[] vName = {
-            ""
+            "college_opinion"
     };
 }

src/servlet/S_CollegeFillScoreOpinion.java

@@ -1,5 +1,7 @@
 package servlet;
 
+import core.process.C_CollegeFillScoreOpinion;
+
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -8,14 +10,16 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet(name = "S_CollegeFillScoreOpinion")
+@WebServlet("college-fill-score-opinion")
 public class S_CollegeFillScoreOpinion extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
         Map<String,String> vMap = servlet.Utils.getVMap(vName,request);
+        C_CollegeFillScoreOpinion p =new C_CollegeFillScoreOpinion();
 
     }
     static String[] vName = {
-            ""
+            "college_opinion",
+            "college_score"
     };
 }

src/servlet/S_MentorFillOpeningReportOpinion.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet(name = "S_MentorFillOpeningReportOpinion")
+@WebServlet("mentor-fill-opening-report-opinion")
 public class S_MentorFillOpeningReportOpinion extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
@@ -16,6 +16,6 @@ public class S_MentorFillOpeningReportOpinion extends HttpServlet {
 
     }
     static String[] vName = {
-            ""
+            "mentor_opinion"
     };
 }

src/servlet/S_MentorFillReview.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet(name = "S_MentorFillReview")
+@WebServlet("mentor-fill-review")
 public class S_MentorFillReview extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
@@ -16,6 +16,7 @@ public class S_MentorFillReview extends HttpServlet {
 
     }
     static String[] vName = {
-            ""
+            "total_grade",
+            "review_opinion"
     };
 }

src/servlet/S_ReviewerFillReview.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet(name = "S_ReviewerFillReview")
+@WebServlet("reviewer-fill-review")
 public class S_ReviewerFillReview extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
@@ -16,6 +16,7 @@ public class S_ReviewerFillReview extends HttpServlet {
 
     }
     static String[] vName = {
-            ""
+            "score",
+            "opinion"
     };
 }

src/servlet/S_SchoolFillScoreOpinion.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet(name = "S_SchoolFillScoreOpinion")
+@WebServlet("school-fill-score-opinion")
 public class S_SchoolFillScoreOpinion extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
@@ -16,6 +16,7 @@ public class S_SchoolFillScoreOpinion extends HttpServlet {
 
     }
     static String[] vName = {
-            ""
+            "school_opinion",
+            "school_score"
     };
 }

src/servlet/S_SecretaryFillOpeningReportRecord.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet(name = "S_SecretaryFillOpeningReportRecord")
+@WebServlet("secretary-fill-opening-report-record")
 public class S_SecretaryFillOpeningReportRecord extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
@@ -16,6 +16,6 @@ public class S_SecretaryFillOpeningReportRecord extends HttpServlet {
 
     }
     static String[] vName = {
-            ""
+            "secretary_record"
     };
 }

src/servlet/S_SecretaryFillReplyRecord.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet(name = "secretary-fill-reply-record")
+@WebServlet("secretary-fill-reply-record")
 public class S_SecretaryFillReplyRecord extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
@@ -16,6 +16,6 @@ public class S_SecretaryFillReplyRecord extends HttpServlet {
 
     }
     static String[] vName = {
-            ""
+            "secretary_record"
     };
 }

src/servlet/S_TeacherTeamFillOpeningReportOpinion.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet(name = "teacher-team-fill-opening-report-opinion")
+@WebServlet("teacher-team-fill-opening-report-opinion")
 public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
@@ -16,6 +16,6 @@ public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet {
 
     }
     static String[] vName = {
-            ""
+            "report_teacher_team_opinion"
     };
 }

src/servlet/S_TeacherTeamFillScoreOpinion.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet(name = "S_TeacherTeamFillScoreOpinion")
+@WebServlet("teacher-team-fill-score-opinion")
 public class S_TeacherTeamFillScoreOpinion extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");
@@ -16,6 +16,7 @@ public class S_TeacherTeamFillScoreOpinion extends HttpServlet {
 
     }
     static String[] vName = {
-            ""
+            "teacher_team_opinion",
+            "teacher_team_score"
     };
 }