Merge remote-tracking branch 'remotes/origin/zgl' into wmj

# Conflicts:
#	.idea/artifacts/GDMS_war_exploded.xml
#	.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml
#	.idea/misc.xml
#	GDMS.iml

.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

src/core/process/C_CollegeFillOpeningReportOpinion.java

@@ -13,7 +13,7 @@ public class C_CollegeFillOpeningReportOpinion extends TempProcess{
     Map<String,String> vMap;
     private static String buttonName ="学院开题意见";
     protected static String iconURL="../cssFile/images/fill.png";
-    protected static String targetURL="";
+    protected static String targetURL="/home/college-fill-opening-report-opinion";
 
     static  String table="graduation_design_opening_report_opinion_record";
 

src/core/process/C_CollegeFillScoreOpinion.java

@@ -13,7 +13,9 @@ public class C_CollegeFillScoreOpinion extends TempProcess{
     String graduationDesignId;
     Map<String,String> vMap;
     private static String buttonName ="学院老师评分";
-    protected static String iconURL="\"../cssFile/images/fill.png\"";
+    protected static String iconURL="../cssFile/images/fill.png";
+    protected static String targetURL="/home/college-fill-score-opinion";
+
     static  String table="graduation_design_reply_opinion_record_score";
 
     public void fillInformation() throws Exception{

src/core/process/C_MentorFillOpeningReportOpinion.java

@@ -13,7 +13,9 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{
     String graduationDesignId;
     Map<String,String> vMap;
     private static String buttonName ="导师开题意见";
-    protected static String iconURL="\"../cssFile/images/fill.png\"";
+    protected static String iconURL="../cssFile/images/fill.png\";
+    protected static String targetURL="/home/mentor-fill-opening-report-opinion";
+
     static String table="graduation_design_opening_report_opinion_record";
 
     public void fillInformation() throws Exception{

src/core/process/C_MentorFillReview.java

@@ -14,6 +14,8 @@ public class C_MentorFillReview extends TempProcess {
     public Map<String,String> vMap;
     private static String buttonName ="指导老师评阅";
     protected static String iconURL="\"../cssFile/images/fill.png\"";
+    protected static String targetURL="/home/mentor-fill-review";
+
     static String table="graduation_design_finished_product_mentor_score";
 
     public void teacherTeamFillOpeningReportOpinion() throws Exception{

src/core/process/C_ReviewerFillReview.java

@@ -13,6 +13,8 @@ public class C_ReviewerFillReview extends TempProcess {
     public Map<String,String> vMap;
     private static String buttonName ="评阅老师评阅";
     protected static String iconURL="\"../cssFile/images/fill.png\"";
+    protected static String targetURL="/home/reviewer-fill-review";
+
 
     static String table="graduation_design_finished_product_reviewer_score";
 

src/core/process/C_SchoolFillScoreOpinion.java

@@ -14,6 +14,8 @@ public class C_SchoolFillScoreOpinion extends TempProcess {
     Map<String,String> vMap;
     private static String buttonName ="学院老师评分";
     protected static String iconURL="\"../cssFile/images/fill.png\"";
+    protected static String targetURL="/home/school-fill-score-opinion";
+
 
     static String table="graduation_design_reply_opinion_record_score";
     public void fillInformation() throws Exception{

src/core/process/C_SecretaryFillOpeningReportOpinion.java

@@ -14,6 +14,8 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{
     Map<String,String> vMap;
     private static String buttonName ="提交开题纪要";
     protected static String iconURL="\"../cssFile/images/fill.png\"";
+    protected static String targetURL="/home/secretary-fill-opening-report-record";
+
 
     static  String table="graduation_design_opening_report_opinion_record";
 

src/core/process/C_SecretaryFillReplyRecord.java

@@ -14,6 +14,8 @@ public class C_SecretaryFillReplyRecord extends TempProcess{
     Map<String,String> vMap;
     private static String buttonName ="提交答辩记录";
     protected static String iconURL="\"../cssFile/images/fill.png\"";
+    protected static String targetURL="/home/secretary-fill-reply-record";
+
 
     static  String table="graduation_design_reply_opinion_record_score";
 

src/core/process/C_StudentFillGraduationDesignInformation.java

@@ -13,6 +13,7 @@ public class C_StudentFillGraduationDesignInformation extends TempProcess{
     Map<String,String> vMap;
     private static String buttonName ="填写选题信息";
     protected static String iconURL="../cssFile/images/filText.png";
+    protected static String targetURL="/home/student-fill-graduation-design-information";
 
     static  String table="graduation_design_opening_report_opinion_record";
 

src/core/process/C_StudentSelectTeacher.java

@@ -12,7 +12,8 @@ public class C_StudentSelectTeacher extends TempProcess {
     String studentId;
     String teacherId;
     private static String buttonName ="选择老师";
-    protected static String iconURL="\"../cssFile/images/select.png\"";
+    protected static String iconURL="../cssFile/images/select.png";
+    protected static String targetURL="/home/student-select-teacher";
 
     public void select()throws Exception{
         if(!check()) throw new GExcptInit("ID Attrs init error!");

src/core/process/C_StudentUploadFinishedProduct.java

@@ -12,7 +12,9 @@ public class C_StudentUploadFinishedProduct {
     File finishedProduct;
     String graduationDesignId;
     private static String buttonName ="提交定稿";
-    protected static String iconURL="\"../cssFile/images/upload.png\"";
+    protected static String iconURL="../cssFile/images/upload.png";
+    protected static String targetURL="/home/student-upload-finished-product";
+
 
     static String file_type = "finished_product";
     public void uploadOpeningReport() throws Exception{

src/core/process/C_StudentUploadOpeningReport.java

@@ -12,7 +12,8 @@ public class C_StudentUploadOpeningReport extends TempProcess{
     String graduationDesignId;
     private static String buttonName ="提交开题报告";
     static String file_type = "opening_report";
-    protected static String iconURL="\"../cssFile/images/upload.png\"";
+    protected static String iconURL="../cssFile/images/upload.png";
+    protected static String targetURL="/home/student-upload-opening-report";
 
     public void uploadOpeningReport() throws Exception{
         if(!check()) throw new GExcptInit("Upload OpeningReport Attrs init error!");

src/core/process/C_TeacherSelectStudent.java

@@ -13,6 +13,7 @@ public class C_TeacherSelectStudent extends TempProcess {
     String teacherId;
     private static String buttonName ="选择学生";
     protected static String iconURL="";
+    protected static String targetURL="/home/teacher-select-student";
 
     public void select()throws Exception{
         if(!check()) throw new GExcptInit("ID Attrs init error!");

src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

@@ -14,6 +14,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
     Map<String,String> vMap;
     private static String buttonName ="开题小组意见";
     protected static String iconURL="\"../cssFile/images/fill.png\"";
+    protected static String targetURL="/home/teacher-team-fill-opening-report-opinion";
 
     static  String table="graduation_design_opening_report_opinion_record";
 

src/core/process/C_TeacherTeamFillScoreOpinion.java

@@ -12,6 +12,8 @@ public class C_TeacherTeamFillScoreOpinion extends TempProcess {
 
     private static String buttonName = "答辩小组评分";
     protected static String iconURL="\"../cssFile/images/fill.png\"";
+    protected static String targetURL="/home/teacher-team-fill-score-opinion";
+
     String graduationDesignId;
     Map<String,String> vMap;
 

src/servlet/S_CollegeFillOpeningReportOpinion.java

@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/college-fill-opening-report-opinion")
+@WebServlet("/home/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");

src/servlet/S_CollegeFillScoreOpinion.java

@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/college-fill-score-opinion")
+@WebServlet("/home/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");

src/servlet/S_MentorFillOpeningReportOpinion.java

@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/mentor-fill-opening-report-opinion")
+@WebServlet("/home/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");

src/servlet/S_MentorFillReview.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/mentor-fill-review")
+@WebServlet("/home/mentor-fill-review")
 public class S_MentorFillReview extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");

src/servlet/S_ReviewerFillReview.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/reviewer-fill-review")
+@WebServlet("/home/reviewer-fill-review")
 public class S_ReviewerFillReview extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         String id = request.getParameter("id");

src/servlet/S_SchoolFillScoreOpinion.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/school-fill-score-opinion")
+@WebServlet("/home/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");

src/servlet/S_SecretaryFillOpeningReportRecord.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/secretary-fill-opening-report-record")
+@WebServlet("/home/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");

src/servlet/S_SecretaryFillReplyRecord.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/secretary-fill-reply-record")
+@WebServlet("/home/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");

src/servlet/S_StudentFillGraduationDesignInformation.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/student-fill-graduation-design-information")
+@WebServlet("/home/student-fill-graduation-design-information")
 public class S_StudentFillGraduationDesignInformation extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 

src/servlet/S_StudentSelectTeacher.java

@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-@WebServlet("/student-select-teacher")
+@WebServlet("/home/student-select-teacher")
 public class S_StudentSelectTeacher extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);

src/servlet/S_StudentUploadFinishedProduct.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-@WebServlet("/student-upload-finished-product")
+@WebServlet("/home/student-upload-finished-product")
 @MultipartConfig
 public class S_StudentUploadFinishedProduct extends HttpServlet {
     static String fileType = "graduation_design_finished_product";

src/servlet/S_StudentUploadOpeningReport.java

@@ -12,7 +12,7 @@ import javax.servlet.http.Part;
 import java.io.IOException;
 import java.util.UUID;
 
-@WebServlet("/student-upload-opening-report")
+@WebServlet("/home/student-upload-opening-report")
 @MultipartConfig
 public class S_StudentUploadOpeningReport extends HttpServlet {
     static String fileType = "graduation_design_opening_report";

src/servlet/S_TeacherSelectStudent.java

@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-@WebServlet("/teacher-select-student")
+@WebServlet("/home/teacher-select-student")
 public class S_TeacherSelectStudent extends HttpServlet {
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         super.doPost(request, response);

src/servlet/S_TeacherTeamFillOpeningReportOpinion.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/teacher-team-fill-opening-report-opinion")
+@WebServlet("/home/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");

src/servlet/S_TeacherTeamFillScoreOpinion.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 
-@WebServlet("/teacher-team-fill-score-opinion")
+@WebServlet("/home/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");