From d8df3a3f81daa99b630fcdfdfe14423303f47187 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Mon, 14 Jan 2019 22:23:16 +0800 Subject: [PATCH 01/28] =?UTF-8?q?1=E3=80=81global=5Ftime=5Fpoint=E5=A1=AB?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/gdms/GlobalTimePoint.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json index f1d908e..b5d8112 100644 --- a/src/gdms/GlobalTimePoint.json +++ b/src/gdms/GlobalTimePoint.json @@ -1,9 +1,9 @@ { - "teacher_choose_student_start_date":"";, - "student_choose_teacher_start_date": "",; - "choose_end_date": "",; - "opening_report_opinion_deadline_date": "",; - "finished_product_deadline_date": "",; - "finished_product_review_deadline_date": "",; - "reply_opition_deadline_date": ""; + "teacher_choose_student_start_date":"", + "student_choose_teacher_start_date": "", + "choose_end_date": "", + "opening_report_opinion_deadline_date": "", + "finished_product_deadline_date": "", + "finished_product_review_deadline_date": "", + "reply_opition_deadline_date": "" } \ No newline at end of file From b5ceb5b4198c66701aba363f5d79c54f0b54f4de Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Mon, 14 Jan 2019 22:30:06 +0800 Subject: [PATCH 02/28] Merge remote-tracking branch 'remotes/origin/master' into zgl # Conflicts: # src/gdms/GlobalTimePoint.json --- src/gdms/GlobalTimePoint.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gdms/GlobalTimePoint.json b/src/gdms/GlobalTimePoint.json index f1d908e..b5d8112 100644 --- a/src/gdms/GlobalTimePoint.json +++ b/src/gdms/GlobalTimePoint.json @@ -1,9 +1,9 @@ { - "teacher_choose_student_start_date":"";, - "student_choose_teacher_start_date": "",; - "choose_end_date": "",; - "opening_report_opinion_deadline_date": "",; - "finished_product_deadline_date": "",; - "finished_product_review_deadline_date": "",; - "reply_opition_deadline_date": ""; + "teacher_choose_student_start_date":"", + "student_choose_teacher_start_date": "", + "choose_end_date": "", + "opening_report_opinion_deadline_date": "", + "finished_product_deadline_date": "", + "finished_product_review_deadline_date": "", + "reply_opition_deadline_date": "" } \ No newline at end of file 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 03/28] 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); Maplimits = 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 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 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 04/28] 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 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 getvMap() { + return vMap; + } + public void setvMap(Map 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); + Maplimits = 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 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); + Maplimits = new HashMap<>(); + limits.put("id",this.getTeacherID()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + } + + + public Map getvMap() { + return vMap; + } + public void setvMap(Map 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 05/28] 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 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); Maplimits = 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 vMap) { this.vMap = vMap; From 7a74e1e5ad5e540f632ba5310750ff15b3f6ed37 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 09:55:28 +0800 Subject: [PATCH 06/28] Merge remote-tracking branch 'remotes/origin/master' into zgl # Conflicts: # src/gdms/GlobalTimePoint.json --- src/servlet/S_CollegeFillOpeningReportOpinion.java | 2 +- src/servlet/S_CollegeFillScoreOpinion.java | 2 +- src/servlet/S_MentorFillOpeningReportOpinion.java | 2 +- src/servlet/S_MentorFillReview.java | 2 +- src/servlet/S_ReviewerFillReview.java | 2 +- src/servlet/S_SchoolFillScoreOpinion.java | 2 +- src/servlet/S_SecretaryFillOpeningReportRecord.java | 2 +- src/servlet/S_TeacherTeamFillScoreOpinion.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/servlet/S_CollegeFillOpeningReportOpinion.java b/src/servlet/S_CollegeFillOpeningReportOpinion.java index 6162fa5..ea991b7 100644 --- a/src/servlet/S_CollegeFillOpeningReportOpinion.java +++ b/src/servlet/S_CollegeFillOpeningReportOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_CollegeFillOpeningReportOpinion") +@WebServlet(name = "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"); diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java index 0d25745..bb9edad 100644 --- a/src/servlet/S_CollegeFillScoreOpinion.java +++ b/src/servlet/S_CollegeFillScoreOpinion.java @@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -@WebServlet(name = "S_CollegeFillScoreOpinion") +@WebServlet(name = "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"); diff --git a/src/servlet/S_MentorFillOpeningReportOpinion.java b/src/servlet/S_MentorFillOpeningReportOpinion.java index 625520f..1f46470 100644 --- a/src/servlet/S_MentorFillOpeningReportOpinion.java +++ b/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(name = "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"); diff --git a/src/servlet/S_MentorFillReview.java b/src/servlet/S_MentorFillReview.java index f28b2d1..f2a8343 100644 --- a/src/servlet/S_MentorFillReview.java +++ b/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(name = "mentor-fill-review") public class S_MentorFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_ReviewerFillReview.java b/src/servlet/S_ReviewerFillReview.java index a23d80a..aa23d5f 100644 --- a/src/servlet/S_ReviewerFillReview.java +++ b/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(name = "reviewer-fill-review") public class S_ReviewerFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_SchoolFillScoreOpinion.java b/src/servlet/S_SchoolFillScoreOpinion.java index 97d7cd5..c4c6f2d 100644 --- a/src/servlet/S_SchoolFillScoreOpinion.java +++ b/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(name = "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"); diff --git a/src/servlet/S_SecretaryFillOpeningReportRecord.java b/src/servlet/S_SecretaryFillOpeningReportRecord.java index 0fc9fb5..8d71b7d 100644 --- a/src/servlet/S_SecretaryFillOpeningReportRecord.java +++ b/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(name = "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"); diff --git a/src/servlet/S_TeacherTeamFillScoreOpinion.java b/src/servlet/S_TeacherTeamFillScoreOpinion.java index a72ac08..45fa2aa 100644 --- a/src/servlet/S_TeacherTeamFillScoreOpinion.java +++ b/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(name = "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"); 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 07/28] 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 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 getvMap() { + public Map getVMap() { return vMap; } - public void setvMap(Map vMap) { + public void setVMap(Map 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); Maplimits = 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 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 getvMap() { + public Map getVMap() { return vMap; } - public void setvMap(Map vMap) { + public void setVMap(Map 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); Maplimits = 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 vMap) { this.vMap = vMap; } - + public Map 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 08/28] =?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 @@ - + \ 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 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 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 getvMap() { - return vMap; - } - public void setvMap(Map 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 vMap) { + this.vMap = vMap; + } + public Map 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 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 vMap) { this.vMap = vMap; } + public Map 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 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 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 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 vMap) { this.vMap = vMap; } - + public Map getVMap() { + return vMap; + } } From b26ef60873867576f7b1dd19e3351c53e6684fb1 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 14:46:32 +0800 Subject: [PATCH 09/28] Merge remote-tracking branch 'remotes/origin/master' into zgl # Conflicts: # src/servlet/S_CollegeFillOpeningReportOpinion.java # src/servlet/S_CollegeFillScoreOpinion.java # src/servlet/S_MentorFillOpeningReportOpinion.java # src/servlet/S_MentorFillReview.java # src/servlet/S_ReviewerFillReview.java # src/servlet/S_SchoolFillScoreOpinion.java # src/servlet/S_SecretaryFillOpeningReportRecord.java # src/servlet/S_TeacherTeamFillScoreOpinion.java --- .idea/artifacts/GDMS_war_exploded.xml | 2 + .idea/dataSources.xml | 2 +- .../356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml | 2164 ----------------- .idea/libraries/tomcat_lib.xml | 4 +- .idea/misc.xml | 2 +- GDMS.iml | 31 +- 6 files changed, 33 insertions(+), 2172 deletions(-) delete mode 100644 .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml index 1d55d9c..ee088c9 100644 --- a/.idea/artifacts/GDMS_war_exploded.xml +++ b/.idea/artifacts/GDMS_war_exploded.xml @@ -10,6 +10,8 @@ + + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index c00abce..05864f1 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mariadb true org.mariadb.jdbc.Driver diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml deleted file mode 100644 index fbbe276..0000000 --- a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml +++ /dev/null @@ -1,2164 +0,0 @@ - - - - - 10.3.10 - MariaDB - InnoDB - lower/lower - - - 1 - 1 - utf8_general_ci - - - utf8_general_ci - - - utf8_general_ci - - - utf8_general_ci - - - latin1_swedish_ci - - - utf8_general_ci - - - armscii8 - 0 - - - armscii8 - 1 - - - armscii8 - 0 - - - armscii8 - 0 - - - ascii - 0 - - - ascii - 1 - - - ascii - 0 - - - ascii - 0 - - - big5 - 0 - - - big5 - 1 - - - big5 - 0 - - - big5 - 0 - - - binary - 1 - - - cp1250 - 0 - - - cp1250 - 0 - - - cp1250 - 0 - - - cp1250 - 1 - - - cp1250 - 0 - - - cp1250 - 0 - - - cp1250 - 0 - - - cp1251 - 0 - - - cp1251 - 0 - - - cp1251 - 1 - - - cp1251 - 0 - - - cp1251 - 0 - - - cp1251 - 0 - - - cp1251 - 0 - - - cp1256 - 0 - - - cp1256 - 1 - - - cp1256 - 0 - - - cp1256 - 0 - - - cp1257 - 0 - - - cp1257 - 1 - - - cp1257 - 0 - - - cp1257 - 0 - - - cp1257 - 0 - - - cp850 - 0 - - - cp850 - 1 - - - cp850 - 0 - - - cp850 - 0 - - - cp852 - 0 - - - cp852 - 1 - - - cp852 - 0 - - - cp852 - 0 - - - cp866 - 0 - - - cp866 - 1 - - - cp866 - 0 - - - cp866 - 0 - - - cp932 - 0 - - - cp932 - 1 - - - cp932 - 0 - - - cp932 - 0 - - - dec8 - 0 - - - dec8 - 0 - - - dec8 - 1 - - - dec8 - 0 - - - eucjpms - 0 - - - eucjpms - 1 - - - eucjpms - 0 - - - eucjpms - 0 - - - euckr - 0 - - - euckr - 1 - - - euckr - 0 - - - euckr - 0 - - - gb2312 - 0 - - - gb2312 - 1 - - - gb2312 - 0 - - - gb2312 - 0 - - - gbk - 0 - - - gbk - 1 - - - gbk - 0 - - - gbk - 0 - - - geostd8 - 0 - - - geostd8 - 1 - - - geostd8 - 0 - - - geostd8 - 0 - - - greek - 0 - - - greek - 1 - - - greek - 0 - - - greek - 0 - - - hebrew - 0 - - - hebrew - 1 - - - hebrew - 0 - - - hebrew - 0 - - - hp8 - 0 - - - hp8 - 1 - - - hp8 - 0 - - - hp8 - 0 - - - keybcs2 - 0 - - - keybcs2 - 1 - - - keybcs2 - 0 - - - keybcs2 - 0 - - - koi8r - 0 - - - koi8r - 1 - - - koi8r - 0 - - - koi8r - 0 - - - koi8u - 0 - - - koi8u - 1 - - - koi8u - 0 - - - koi8u - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 0 - - - latin1 - 1 - - - latin1 - 0 - - - latin2 - 0 - - - latin2 - 0 - - - latin2 - 0 - - - latin2 - 1 - - - latin2 - 0 - - - latin2 - 0 - - - latin2 - 0 - - - latin5 - 0 - - - latin5 - 0 - - - latin5 - 1 - - - latin5 - 0 - - - latin7 - 0 - - - latin7 - 0 - - - latin7 - 1 - - - latin7 - 0 - - - latin7 - 0 - - - latin7 - 0 - - - macce - 0 - - - macce - 1 - - - macce - 0 - - - macce - 0 - - - macroman - 0 - - - macroman - 1 - - - macroman - 0 - - - macroman - 0 - - - sjis - 0 - - - sjis - 1 - - - sjis - 0 - - - sjis - 0 - - - swe7 - 0 - - - swe7 - 0 - - - swe7 - 1 - - - swe7 - 0 - - - tis620 - 0 - - - tis620 - 0 - - - tis620 - 1 - - - tis620 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 1 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ucs2 - 0 - - - ujis - 0 - - - ujis - 1 - - - ujis - 0 - - - ujis - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 1 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16 - 0 - - - utf16le - 0 - - - utf16le - 1 - - - utf16le - 0 - - - utf16le - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 1 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf32 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 1 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 1 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - utf8mb4 - 0 - - - 管理员 -
- - 公告 -
- - 毕业设计 -
- - 毕设论文 -
- - 指导老师评定成绩 -
- - 评阅老师对论文的评审成绩 -
- - 毕业设计信息 -
- - 开题报告 -
- - 开题报告会纪要 -
- - 答辩 -
- - 答辩记录表 -
- - 开题报告秘书组 -
- - 开题报告老师组 -
- - 专业信息 -
- - 答辩秘书小组 -
- - 答辩教师组 -
- - 学生用户 -
- - 老师用户 -
- - 1 - char(20)|0s - 1 - normal - - - 2 - char(255)|0s - 1 - normal - - - 3 - char(30)|0s - normal - - - 4 - char(40)|0s - normal - - - 5 - char(20)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - text|0s - normal - - - 3 - text|0s - normal - - - 4 - date|0s - normal - - - 5 - varchar(255)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 4 - char(1)|0s - normal - - - 5 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - int(11)|0s - normal - - - 3 - date|0s - normal - - - 4 - varchar(255)|0s - normal - - - 5 - text|0s - normal - - - 6 - text|0s - normal - - - 7 - text|0s - normal - - - 8 - text|0s - normal - - - 9 - float|0s - normal - - - 10 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - float|0s - normal - - - 3 - float|0s - normal - - - 4 - float|0s - normal - - - 5 - float|0s - normal - - - 6 - float|0s - normal - - - 7 - float|0s - normal - - - 8 - float|0s - normal - - - 9 - float|0s - normal - - - 10 - float|0s - normal - - - 11 - float|0s - normal - - - 12 - float|0s - normal - - - 13 - float|0s - normal - - - 14 - float|0s - normal - - - 15 - float|0s - normal - - - 16 - float|0s - normal - - - 17 - text|0s - normal - - - 18 - date|0s - normal - - - 19 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - float|0s - normal - - - 4 - text|0s - normal - - - 5 - date|0s - normal - - - 6 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - varchar(255)|0s - normal - - - 3 - varchar(255)|0s - normal - - - 4 - varchar(255)|0s - normal - - - 5 - varchar(255)|0s - normal - - - 6 - varchar(255)|0s - normal - - - 7 - text|0s - normal - - - 8 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - date|0s - normal - - - 3 - varchar(255)|0s - normal - - - 4 - varchar(255)|0s - normal - - - 5 - char(20)|0s - normal - - - 6 - char(20)|0s - normal - - - 7 - int(11)|0s - normal - - - 8 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - text|0s - normal - - - 4 - date|0s - normal - - - 5 - text|0s - normal - - - 6 - date|0s - normal - - - 7 - text|0s - normal - - - 8 - date|0s - normal - - - 9 - text|0s - normal - - - 10 - date|0s - normal - - - 11 - char(1)|0s - normal - - - 12 - char(1)|0s - normal - - - 13 - char(1)|0s - normal - - - 14 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - date|0s - normal - - - 3 - varchar(255)|0s - normal - - - 4 - char(20)|0s - normal - - - 5 - char(20)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 4 - text|0s - normal - - - 5 - date|0s - normal - - - 6 - text|0s - normal - - - 7 - date|0s - normal - - - 8 - text|0s - normal - - - 9 - float|0s - normal - - - 10 - date|0s - normal - - - 11 - text|0s - normal - - - 12 - float|0s - normal - - - 13 - date|0s - normal - - - 14 - text|0s - normal - - - 15 - float|0s - normal - - - 16 - date|0s - normal - - - 17 - char(1)|0s - normal - - - 18 - char(1)|0s - normal - - - 19 - char(1)|0s - normal - - - 20 - char(1)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 1 - leader_student_id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 1 - leader_teacher_id - 1 - - - 1 - char(8)|0s - 1 - normal - - - 2 - varchar(255)|0s - normal - - - 3 - varchar(255)|0s - normal - - - 4 - varchar(255)|0s - normal - - - 1 - profession_code - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 1 - leader_student_id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(20)|0s - normal - - - 3 - char(20)|0s - normal - - - 1 - leader_teacher_id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(255)|0s - 1 - normal - - - 3 - char(30)|0s - normal - - - 4 - char(40)|0s - normal - - - 5 - char(20)|0s - normal - - - 6 - char(4)|0s - normal - - - 7 - char(8)|0s - normal - - - 1 - id - 1 - - - 1 - char(20)|0s - 1 - normal - - - 2 - char(255)|0s - 1 - normal - - - 3 - char(30)|0s - normal - - - 4 - char(40)|0s - normal - - - 5 - char(20)|0s - normal - - - 6 - varchar(255)|0s - normal - - - 7 - varchar(255)|0s - normal - - - 8 - char(8)|0s - normal - - - 1 - id - 1 - - - \ No newline at end of file diff --git a/.idea/libraries/tomcat_lib.xml b/.idea/libraries/tomcat_lib.xml index 569121d..19e08f8 100644 --- a/.idea/libraries/tomcat_lib.xml +++ b/.idea/libraries/tomcat_lib.xml @@ -1,10 +1,10 @@ - + - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 11bca97..35bdbab 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/GDMS.iml b/GDMS.iml index 23fde1f..0aad383 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -17,14 +17,37 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - + From e744730651259da467c01f77b98b8b320a132188 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 14:47:12 +0800 Subject: [PATCH 10/28] Merge remote-tracking branch 'remotes/origin/master' into zgl # Conflicts: # src/servlet/S_CollegeFillOpeningReportOpinion.java # src/servlet/S_CollegeFillScoreOpinion.java # src/servlet/S_MentorFillOpeningReportOpinion.java # src/servlet/S_MentorFillReview.java # src/servlet/S_ReviewerFillReview.java # src/servlet/S_SchoolFillScoreOpinion.java # src/servlet/S_SecretaryFillOpeningReportRecord.java # src/servlet/S_TeacherTeamFillScoreOpinion.java --- .../8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml | 2161 +++++++++++++++++ 1 file changed, 2161 insertions(+) create mode 100644 .idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml diff --git a/.idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml b/.idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml new file mode 100644 index 0000000..c17251b --- /dev/null +++ b/.idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml @@ -0,0 +1,2161 @@ + + + + + 10.3.12 + MARIADB + InnoDB + lower/lower + + + 1 + 1 + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + latin1_swedish_ci + + + armscii8 + 0 + + + armscii8 + 1 + + + armscii8 + 0 + + + armscii8 + 0 + + + ascii + 0 + + + ascii + 1 + + + ascii + 0 + + + ascii + 0 + + + big5 + 0 + + + big5 + 1 + + + big5 + 0 + + + big5 + 0 + + + binary + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 1 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1256 + 0 + + + cp1256 + 1 + + + cp1256 + 0 + + + cp1256 + 0 + + + cp1257 + 0 + + + cp1257 + 1 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp850 + 0 + + + cp850 + 1 + + + cp850 + 0 + + + cp850 + 0 + + + cp852 + 0 + + + cp852 + 1 + + + cp852 + 0 + + + cp852 + 0 + + + cp866 + 0 + + + cp866 + 1 + + + cp866 + 0 + + + cp866 + 0 + + + cp932 + 0 + + + cp932 + 1 + + + cp932 + 0 + + + cp932 + 0 + + + dec8 + 0 + + + dec8 + 0 + + + dec8 + 1 + + + dec8 + 0 + + + eucjpms + 0 + + + eucjpms + 1 + + + eucjpms + 0 + + + eucjpms + 0 + + + euckr + 0 + + + euckr + 1 + + + euckr + 0 + + + euckr + 0 + + + gb2312 + 0 + + + gb2312 + 1 + + + gb2312 + 0 + + + gb2312 + 0 + + + gbk + 0 + + + gbk + 1 + + + gbk + 0 + + + gbk + 0 + + + geostd8 + 0 + + + geostd8 + 1 + + + geostd8 + 0 + + + geostd8 + 0 + + + greek + 0 + + + greek + 1 + + + greek + 0 + + + greek + 0 + + + hebrew + 0 + + + hebrew + 1 + + + hebrew + 0 + + + hebrew + 0 + + + hp8 + 0 + + + hp8 + 1 + + + hp8 + 0 + + + hp8 + 0 + + + keybcs2 + 0 + + + keybcs2 + 1 + + + keybcs2 + 0 + + + keybcs2 + 0 + + + koi8r + 0 + + + koi8r + 1 + + + koi8r + 0 + + + koi8r + 0 + + + koi8u + 0 + + + koi8u + 1 + + + koi8u + 0 + + + koi8u + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 1 + + + latin1 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 1 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin5 + 0 + + + latin5 + 0 + + + latin5 + 1 + + + latin5 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 1 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + macce + 0 + + + macce + 1 + + + macce + 0 + + + macce + 0 + + + macroman + 0 + + + macroman + 1 + + + macroman + 0 + + + macroman + 0 + + + sjis + 0 + + + sjis + 1 + + + sjis + 0 + + + sjis + 0 + + + swe7 + 0 + + + swe7 + 0 + + + swe7 + 1 + + + swe7 + 0 + + + tis620 + 0 + + + tis620 + 0 + + + tis620 + 1 + + + tis620 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 1 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ujis + 0 + + + ujis + 1 + + + ujis + 0 + + + ujis + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 1 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16le + 0 + + + utf16le + 1 + + + utf16le + 0 + + + utf16le + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 1 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 1 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 1 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + 管理员 +
+ + 公告 +
+ + 毕业设计 +
+ + 毕设论文 +
+ + 指导老师评定成绩 +
+ + 评阅老师对论文的评审成绩 +
+ + 毕业设计信息 +
+ + 开题报告 +
+ + 开题报告会纪要 +
+ + 答辩 +
+ + 答辩记录表 +
+ + 开题报告秘书组 +
+ + 开题报告老师组 +
+ + 专业信息 +
+ + 答辩秘书小组 +
+ + 答辩教师组 +
+ + 学生用户 +
+ + 老师用户 +
+ + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + varchar(255)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + char(1)|0s + normal + + + 5 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + int(11)|0s + normal + + + 3 + date|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + text|0s + normal + + + 6 + text|0s + normal + + + 7 + text|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + float|0s + normal + + + 3 + float|0s + normal + + + 4 + float|0s + normal + + + 5 + float|0s + normal + + + 6 + float|0s + normal + + + 7 + float|0s + normal + + + 8 + float|0s + normal + + + 9 + float|0s + normal + + + 10 + float|0s + normal + + + 11 + float|0s + normal + + + 12 + float|0s + normal + + + 13 + float|0s + normal + + + 14 + float|0s + normal + + + 15 + float|0s + normal + + + 16 + float|0s + normal + + + 17 + text|0s + normal + + + 18 + date|0s + normal + + + 19 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + float|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + varchar(255)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + text|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(20)|0s + normal + + + 7 + int(11)|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + text|0s + normal + + + 6 + date|0s + normal + + + 7 + text|0s + normal + + + 8 + date|0s + normal + + + 9 + text|0s + normal + + + 10 + date|0s + normal + + + 11 + char(1)|0s + normal + + + 12 + char(1)|0s + normal + + + 13 + char(1)|0s + normal + + + 14 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + char(20)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + text|0s + normal + + + 7 + date|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + date|0s + normal + + + 11 + text|0s + normal + + + 12 + float|0s + normal + + + 13 + date|0s + normal + + + 14 + text|0s + normal + + + 15 + float|0s + normal + + + 16 + date|0s + normal + + + 17 + char(1)|0s + normal + + + 18 + char(1)|0s + normal + + + 19 + char(1)|0s + normal + + + 20 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(8)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 1 + profession_code + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(4)|0s + normal + + + 7 + char(8)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + varchar(255)|0s + normal + + + 8 + char(8)|0s + normal + + + 1 + id + 1 + + + \ No newline at end of file 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 11/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E7=9A=84proce?= =?UTF-8?q?ss?= 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 @@ + - + + diff --git a/GDMS.iml b/GDMS.iml index 20dda90..8e4eff1 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -9,18 +9,40 @@ + + + - - - + + + + + + + + + + + + + + - + + + + + + + + + \ 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 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); Maplimits = 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 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 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 getVMap() { - return vMap; - } - public void setVMap(Map 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 getVMap() { + return vMap; + } + public void setVMap(Map vMap) { + this.vMap = vMap; + } } From 721076b14b844fbb54060b4f62324e20c9d77030 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 15:42:13 +0800 Subject: [PATCH 12/28] Merge remote-tracking branch 'remotes/origin/master' into zgl # Conflicts: # .idea/artifacts/GDMS_war_exploded.xml # .idea/dataSources.xml # .idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml # .idea/libraries/tomcat_lib.xml # .idea/misc.xml # GDMS.iml --- src/core/process/Process.java | 9 ++- .../S_CollegeFillOpeningReportOpinion.java | 2 +- src/servlet/S_CollegeFillScoreOpinion.java | 2 +- .../S_MentorFillOpeningReportOpinion.java | 2 +- src/servlet/S_MentorFillReview.java | 2 +- src/servlet/S_ReviewerFillReview.java | 2 +- src/servlet/S_SchoolFillScoreOpinion.java | 2 +- .../S_SecretaryFillOpeningReportRecord.java | 2 +- src/servlet/S_SecretaryFillReplyRecord.java | 2 +- .../S_StudentUploadFinishedProduct.java | 13 ++- src/servlet/S_StudentUploadOpeningReport.java | 2 +- ...S_TeacherTeamFillOpeningReportOpinion.java | 2 +- .../S_TeacherTeamFillScoreOpinion.java | 2 +- src/servlet/Utils.java | 6 +- src/servlet/account/S_Login.java | 2 +- src/servlet/account/S_Register.java | 2 +- web/cssFile/images/opt.sai2 | Bin 46676 -> 0 bytes web/cssFile/images/search1.sai2 | Bin 15948 -> 0 bytes web/cssFile/images/search2.sai2 | Bin 15684 -> 0 bytes web/{ => home}/download.jsp | 4 +- web/{ => home}/fillSbjMsg.jsp | 6 +- web/{ => home}/fill_Information.jsp | 0 web/{ => home}/get_time.jsp | 0 web/{ => home}/home.jsp | 76 +++++++++--------- web/{ => home}/index.jsp | 0 web/{ => home}/personal_setting.jsp | 6 +- web/{ => home}/result_list.jsp | 0 web/{ => home}/select.jsp | 6 +- web/{ => home}/upload_file.jsp | 14 ++-- web/jsFile/upload_action.js | 5 +- 30 files changed, 97 insertions(+), 74 deletions(-) rename web/{ => home}/download.jsp (85%) rename web/{ => home}/fillSbjMsg.jsp (92%) rename web/{ => home}/fill_Information.jsp (100%) rename web/{ => home}/get_time.jsp (100%) rename web/{ => home}/home.jsp (73%) rename web/{ => home}/index.jsp (100%) rename web/{ => home}/personal_setting.jsp (91%) rename web/{ => home}/result_list.jsp (100%) rename web/{ => home}/select.jsp (92%) rename web/{ => home}/upload_file.jsp (62%) diff --git a/src/core/process/Process.java b/src/core/process/Process.java index 91c5d63..be06a88 100644 --- a/src/core/process/Process.java +++ b/src/core/process/Process.java @@ -4,14 +4,17 @@ import core.operation.Operation; public abstract class Process{ + private static String buttonName; + protected static String targetURL; + + protected static String iconURL; + private String status; private String permission; private Operation operation; private String info; - private static String buttonName; - protected static String targetURL; - protected static String iconURL; + protected abstract boolean check(); public String getPermission() { diff --git a/src/servlet/S_CollegeFillOpeningReportOpinion.java b/src/servlet/S_CollegeFillOpeningReportOpinion.java index f84de95..c7f7367 100644 --- a/src/servlet/S_CollegeFillOpeningReportOpinion.java +++ b/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("/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"); diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java index b66ec58..360e082 100644 --- a/src/servlet/S_CollegeFillScoreOpinion.java +++ b/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("/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"); diff --git a/src/servlet/S_MentorFillOpeningReportOpinion.java b/src/servlet/S_MentorFillOpeningReportOpinion.java index 588215b..d35293a 100644 --- a/src/servlet/S_MentorFillOpeningReportOpinion.java +++ b/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("/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"); diff --git a/src/servlet/S_MentorFillReview.java b/src/servlet/S_MentorFillReview.java index 1ece272..a10cf5c 100644 --- a/src/servlet/S_MentorFillReview.java +++ b/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("/mentor-fill-review") public class S_MentorFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_ReviewerFillReview.java b/src/servlet/S_ReviewerFillReview.java index f950771..f3c754d 100644 --- a/src/servlet/S_ReviewerFillReview.java +++ b/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("/reviewer-fill-review") public class S_ReviewerFillReview extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); diff --git a/src/servlet/S_SchoolFillScoreOpinion.java b/src/servlet/S_SchoolFillScoreOpinion.java index d6b0e9d..fa1fa02 100644 --- a/src/servlet/S_SchoolFillScoreOpinion.java +++ b/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("/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"); diff --git a/src/servlet/S_SecretaryFillOpeningReportRecord.java b/src/servlet/S_SecretaryFillOpeningReportRecord.java index 2ef4f62..94f5ee1 100644 --- a/src/servlet/S_SecretaryFillOpeningReportRecord.java +++ b/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("/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"); diff --git a/src/servlet/S_SecretaryFillReplyRecord.java b/src/servlet/S_SecretaryFillReplyRecord.java index 90a10fa..9efee5e 100644 --- a/src/servlet/S_SecretaryFillReplyRecord.java +++ b/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("/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"); diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java index 20f2fb5..b7271e4 100644 --- a/src/servlet/S_StudentUploadFinishedProduct.java +++ b/src/servlet/S_StudentUploadFinishedProduct.java @@ -14,7 +14,16 @@ public class S_StudentUploadFinishedProduct extends HttpServlet { static String fileType = "graduation_design_finished_product"; protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = "000"; - //String id = request.getParameter("id"); - String fileURL = servlet.Utils.saveFile(request, fileType); + //String files = request.getParameter("file"); + System.out.print("123"); + System.out.print( request.getPart("file")); + System.out.print("123"); + try { + String fileURL = servlet.Utils.saveFile(request, fileType); + }catch (Exception e) + { + System.out.print(e); + } + System.out.print("222"); } } diff --git a/src/servlet/S_StudentUploadOpeningReport.java b/src/servlet/S_StudentUploadOpeningReport.java index 4102e91..ffb5f9c 100644 --- a/src/servlet/S_StudentUploadOpeningReport.java +++ b/src/servlet/S_StudentUploadOpeningReport.java @@ -18,6 +18,6 @@ public class S_StudentUploadOpeningReport extends HttpServlet { static String fileType = "graduation_design_opening_report"; protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String id = request.getParameter("id"); - String fileURL = servlet.Utils.saveFile(request, fileType); + //String fileURL = servlet.Utils.saveFile(request, fileType); } } diff --git a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java index c43e7fd..2e35294 100644 --- a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java +++ b/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("/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"); diff --git a/src/servlet/S_TeacherTeamFillScoreOpinion.java b/src/servlet/S_TeacherTeamFillScoreOpinion.java index a82b234..3a70590 100644 --- a/src/servlet/S_TeacherTeamFillScoreOpinion.java +++ b/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("/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"); diff --git a/src/servlet/Utils.java b/src/servlet/Utils.java index 3cea1d0..0a7f8fb 100644 --- a/src/servlet/Utils.java +++ b/src/servlet/Utils.java @@ -39,10 +39,13 @@ public interface Utils { return getFilePath(table)+getFileName(fileName); } static String saveFile(HttpServletRequest request, String table) throws IOException, ServletException { - Part part = request.getPart("graduation_design"); + System.out.println("utils"); + Part part = request.getPart("file"); + System.out.println("part"); String header = part.getHeader("content-disposition"); String path = header.substring(header.indexOf("filename=") + 10, header.length() - 1); String filePathName = servlet.Utils.getFilePathName(table,path); + System.out.println(filePathName); File file = new File(filePathName); InputStream inputStream = part.getInputStream(); FileOutputStream outputStream = new FileOutputStream(file); @@ -54,6 +57,7 @@ public interface Utils { outputStream.close(); inputStream.close(); part.delete(); + System.out.println("end"); return filePathName; } } diff --git a/src/servlet/account/S_Login.java b/src/servlet/account/S_Login.java index f7b9506..cee72a3 100644 --- a/src/servlet/account/S_Login.java +++ b/src/servlet/account/S_Login.java @@ -38,7 +38,7 @@ public class S_Login extends HttpServlet { return; } request.getSession().setAttribute("user",user); - response.sendRedirect("/home.jsp"); + response.sendRedirect("/home/home.jsp"); return; } } \ No newline at end of file diff --git a/src/servlet/account/S_Register.java b/src/servlet/account/S_Register.java index 1791000..028b4ac 100644 --- a/src/servlet/account/S_Register.java +++ b/src/servlet/account/S_Register.java @@ -43,7 +43,7 @@ public class S_Register extends HttpServlet { response.sendRedirect("/op_fail.jsp"); } request.getSession().setAttribute("user",user); - response.sendRedirect("/home.jsp"); + response.sendRedirect("/home/home.jsp"); return; } } \ No newline at end of file diff --git a/web/cssFile/images/opt.sai2 b/web/cssFile/images/opt.sai2 index 9a62cbd3f128adae105c03786462ba5daefa7abd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 GIT binary patch literal 0 HcmV?d00001 literal 46676 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 at?^G|@<}VUL9wv>bLGyUWKnbg diff --git a/web/cssFile/images/search2.sai2 b/web/cssFile/images/search2.sai2 index 6ba357a022592696010f10b1d43c6a2d9cd40db6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 GIT binary patch literal 0 HcmV?d00001 literal 15684 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 资料下载 - - + +
diff --git a/web/fillSbjMsg.jsp b/web/home/fillSbjMsg.jsp similarity index 92% rename from web/fillSbjMsg.jsp rename to web/home/fillSbjMsg.jsp index 618f0e6..abf830c 100644 --- a/web/fillSbjMsg.jsp +++ b/web/home/fillSbjMsg.jsp @@ -10,9 +10,9 @@ 填写选题信息 - - - + + +
diff --git a/web/fill_Information.jsp b/web/home/fill_Information.jsp similarity index 100% rename from web/fill_Information.jsp rename to web/home/fill_Information.jsp diff --git a/web/get_time.jsp b/web/home/get_time.jsp similarity index 100% rename from web/get_time.jsp rename to web/home/get_time.jsp diff --git a/web/home.jsp b/web/home/home.jsp similarity index 73% rename from web/home.jsp rename to web/home/home.jsp index 69b6a30..11b685a 100644 --- a/web/home.jsp +++ b/web/home/home.jsp @@ -1,5 +1,8 @@ <%@ page import="java.util.List" %> -<%@ page import="java.util.ArrayList" %><%-- +<%@ page import="java.util.ArrayList" %> +<%@ page import="core.user.User" %> +<%@ page import="core.process.Condition" %> +<%@ page import="core.process.Process" %><%-- Created by IntelliJ IDEA. User: lenovo Date: 2019/1/9 @@ -11,30 +14,31 @@ 毕业设计管理系统 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + -<%String type="teacher";pageContext.setAttribute("userType",type);%> -<%List list=new ArrayList<>(); - list.add("001"); - list.add("002"); +<% + User user=(User)session.getAttribute("user"); + String type=user.getType(); + pageContext.setAttribute("userType",type); + Condition condition=user.getCondition(); + //List pList=condition.getProcesses(); + int length=0; int index=0; - pageContext.setAttribute("list",list); - session.setAttribute("list",list); %>
@@ -46,11 +50,11 @@
- +
个人信息
-
退出登录
+
退出登录
@@ -63,7 +67,7 @@
- +
个人信息
 @@ -71,7 +75,7 @@
- +
资料下载
 @@ -79,7 +83,7 @@
- +
选择老师
 @@ -87,7 +91,7 @@
- +
填写信息
 @@ -95,7 +99,7 @@
- +
上传文件
 @@ -103,7 +107,7 @@
- +
填写选题信息
 @@ -112,7 +116,7 @@
- +
填写选题信息
 @@ -129,25 +133,25 @@
- + diff --git a/web/index.jsp b/web/home/index.jsp similarity index 100% rename from web/index.jsp rename to web/home/index.jsp diff --git a/web/personal_setting.jsp b/web/home/personal_setting.jsp similarity index 91% rename from web/personal_setting.jsp rename to web/home/personal_setting.jsp index dd44674..09ee7b5 100644 --- a/web/personal_setting.jsp +++ b/web/home/personal_setting.jsp @@ -6,9 +6,9 @@ To change this template use File | Settings | File Templates. --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - + + + 个人信息 diff --git a/web/result_list.jsp b/web/home/result_list.jsp similarity index 100% rename from web/result_list.jsp rename to web/home/result_list.jsp diff --git a/web/select.jsp b/web/home/select.jsp similarity index 92% rename from web/select.jsp rename to web/home/select.jsp index 9bbf45f..042817e 100644 --- a/web/select.jsp +++ b/web/home/select.jsp @@ -17,9 +17,9 @@ Title - - - + + + <% diff --git a/web/upload_file.jsp b/web/home/upload_file.jsp similarity index 62% rename from web/upload_file.jsp rename to web/home/upload_file.jsp index 3047a1e..ee25ffb 100644 --- a/web/upload_file.jsp +++ b/web/home/upload_file.jsp @@ -9,9 +9,9 @@ 上传文件 - - - + + +
@@ -19,13 +19,15 @@
上传定稿
- +
-
+
+
选择文件
-
上传文件
+
上传文件
+
diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js index c756a06..866ac3a 100644 --- a/web/jsFile/upload_action.js +++ b/web/jsFile/upload_action.js @@ -6,17 +6,18 @@ $(document).ready(function () { function sendFile() { var fileData =new FormData(); var Url4='student-upload-finished-product'; - var file=$('.true-select').files; + var file=$('#select')[0].files[0]; if($('.true-select').val()=='') { alert("请选择文件"); return; } + alert(file); fileData.append("file",file); $.ajax({ type:"post", url:Url4, - date:fileData, + data:fileData, processData:false, contentType:false, success:function (data,status) { From d82601a028c6b1993515a3a9577574c3727f11cd Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 15:43:39 +0800 Subject: [PATCH 13/28] Merge remote-tracking branch 'remotes/origin/master' into zgl # Conflicts: # .idea/artifacts/GDMS_war_exploded.xml # .idea/dataSources.xml # .idea/dataSources/8fdf8c26-c4fe-4cb5-9941-72889c26fde4.xml # .idea/libraries/tomcat_lib.xml # .idea/misc.xml # GDMS.iml --- src/servlet/S_CollegeFillOpeningReportOpinion.java | 2 +- src/servlet/S_CollegeFillScoreOpinion.java | 2 +- src/servlet/S_MentorFillOpeningReportOpinion.java | 2 +- src/servlet/S_MentorFillReview.java | 2 +- src/servlet/S_ReviewerFillReview.java | 2 +- src/servlet/S_SchoolFillScoreOpinion.java | 2 +- src/servlet/S_SecretaryFillOpeningReportRecord.java | 2 +- src/servlet/S_SecretaryFillReplyRecord.java | 2 +- src/servlet/S_StudentFillGraduationDesignInformation.java | 2 +- src/servlet/S_StudentSelectTeacher.java | 2 +- src/servlet/S_StudentUploadFinishedProduct.java | 2 +- src/servlet/S_StudentUploadOpeningReport.java | 2 +- src/servlet/S_TeacherSelectStudent.java | 2 +- src/servlet/S_TeacherTeamFillOpeningReportOpinion.java | 2 +- src/servlet/S_TeacherTeamFillScoreOpinion.java | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/servlet/S_CollegeFillOpeningReportOpinion.java b/src/servlet/S_CollegeFillOpeningReportOpinion.java index c7f7367..ca2d9bb 100644 --- a/src/servlet/S_CollegeFillOpeningReportOpinion.java +++ b/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"); diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java index 360e082..44e29e1 100644 --- a/src/servlet/S_CollegeFillScoreOpinion.java +++ b/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"); diff --git a/src/servlet/S_MentorFillOpeningReportOpinion.java b/src/servlet/S_MentorFillOpeningReportOpinion.java index d35293a..6617ae6 100644 --- a/src/servlet/S_MentorFillOpeningReportOpinion.java +++ b/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"); diff --git a/src/servlet/S_MentorFillReview.java b/src/servlet/S_MentorFillReview.java index a10cf5c..44d5f65 100644 --- a/src/servlet/S_MentorFillReview.java +++ b/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"); diff --git a/src/servlet/S_ReviewerFillReview.java b/src/servlet/S_ReviewerFillReview.java index f3c754d..e22ee73 100644 --- a/src/servlet/S_ReviewerFillReview.java +++ b/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"); diff --git a/src/servlet/S_SchoolFillScoreOpinion.java b/src/servlet/S_SchoolFillScoreOpinion.java index fa1fa02..67dea85 100644 --- a/src/servlet/S_SchoolFillScoreOpinion.java +++ b/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"); diff --git a/src/servlet/S_SecretaryFillOpeningReportRecord.java b/src/servlet/S_SecretaryFillOpeningReportRecord.java index 94f5ee1..7a0ef0e 100644 --- a/src/servlet/S_SecretaryFillOpeningReportRecord.java +++ b/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"); diff --git a/src/servlet/S_SecretaryFillReplyRecord.java b/src/servlet/S_SecretaryFillReplyRecord.java index 9efee5e..91b72e0 100644 --- a/src/servlet/S_SecretaryFillReplyRecord.java +++ b/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"); diff --git a/src/servlet/S_StudentFillGraduationDesignInformation.java b/src/servlet/S_StudentFillGraduationDesignInformation.java index 9838562..5c6d71f 100644 --- a/src/servlet/S_StudentFillGraduationDesignInformation.java +++ b/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 { diff --git a/src/servlet/S_StudentSelectTeacher.java b/src/servlet/S_StudentSelectTeacher.java index 69b8893..452beaf 100644 --- a/src/servlet/S_StudentSelectTeacher.java +++ b/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); diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java index b7271e4..23e888e 100644 --- a/src/servlet/S_StudentUploadFinishedProduct.java +++ b/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"; diff --git a/src/servlet/S_StudentUploadOpeningReport.java b/src/servlet/S_StudentUploadOpeningReport.java index ffb5f9c..9e04357 100644 --- a/src/servlet/S_StudentUploadOpeningReport.java +++ b/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"; diff --git a/src/servlet/S_TeacherSelectStudent.java b/src/servlet/S_TeacherSelectStudent.java index ab880eb..d177fc0 100644 --- a/src/servlet/S_TeacherSelectStudent.java +++ b/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); diff --git a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java index 2e35294..16c5612 100644 --- a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java +++ b/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"); diff --git a/src/servlet/S_TeacherTeamFillScoreOpinion.java b/src/servlet/S_TeacherTeamFillScoreOpinion.java index 3a70590..63788d5 100644 --- a/src/servlet/S_TeacherTeamFillScoreOpinion.java +++ b/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"); From 14734623170897c56465b149d16cf5bcebe94707 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 16:04:53 +0800 Subject: [PATCH 14/28] Merge remote-tracking branch 'remotes/origin/hechu1' # Conflicts: # src/core/process/C_TeacherSearchStudent.java # web/jsFile/upload_action.js --- src/core/process/C_StudentSearchTeacher.java | 19 +++++++++++++++++++ src/core/process/C_StudentSelectTeacher.java | 19 +++++++++++++++++++ src/core/process/C_TeacherSearchStudent.java | 11 ++--------- src/core/process/C_TeacherSelectStudent.java | 19 +++++++++++++++++++ src/core/process/Utils.java | 18 ++++++++++++++++++ src/filter/OnlineCheck.java | 2 +- src/gdms/Configuration.java | 2 +- src/servlet/S_StudentSelectTeacher.java | 1 + .../S_StudentUploadFinishedProduct.java | 13 +++++-------- web/jsFile/upload_action.js | 2 +- 10 files changed, 86 insertions(+), 20 deletions(-) create mode 100644 src/core/process/Utils.java diff --git a/src/core/process/C_StudentSearchTeacher.java b/src/core/process/C_StudentSearchTeacher.java index 65931e4..a519a53 100644 --- a/src/core/process/C_StudentSearchTeacher.java +++ b/src/core/process/C_StudentSearchTeacher.java @@ -36,6 +36,25 @@ public class C_StudentSearchTeacher extends TempProcess{ TeacherInfo.put("phone_number",s[4]); return TeacherInfo; } + public List> _search() throws Exception{ + if(!check()) throw new GExcptInit("teacherId Attrs init error!"); + Search search = new Search() ; + search.setOptions(new HashMap<>()); + search.addOptions("table",table); + List fields = new ArrayList<>(); + fields.add("*"); + search.addOptions("field",fields); + Map limits = new HashMap<>(); + limits.put("id",this.getTeacherID()); + search.addOptions("limits",limits); + search.addOptions("start",0); + search.addOptions("end",10); + Map options = search.execute(null); + List result = (List) options.get("result"); + List> teachersInfo = new ArrayList<>(); + core.process.Utils.formatResult(result, teachersInfo); + return teachersInfo; + } protected boolean check() { if(this.getTeacherID()==null) diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index ee8ada0..596ca94 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -1,5 +1,6 @@ package core.process; +import core.operation.Search; import core.operation.Select; import error.GExcptInit; @@ -20,6 +21,24 @@ public class C_StudentSelectTeacher extends TempProcess { select.addOptions("teacher_id",this.getTeacherId()); Map options=select.execute(null); } + public List> search(String teacherId) throws Exception{ + Search search = new Search() ; + search.setOptions(new HashMap<>()); + search.addOptions("table","teacher"); + List fields = new ArrayList<>(); + fields.add("*"); + search.addOptions("field",fields); + Map limits = new HashMap<>(); + limits.put("id",teacherId); + search.addOptions("limits",limits); + search.addOptions("start",0); + search.addOptions("end",10); + Map options = search.execute(null); + List result = (List) options.get("result"); + List> teachersInfo = new ArrayList<>(); + core.process.Utils.formatResult(result, teachersInfo); + return teachersInfo; + } protected boolean check() { if(this.getStudentId()==null||this.getTeacherId()==null) return false; diff --git a/src/core/process/C_TeacherSearchStudent.java b/src/core/process/C_TeacherSearchStudent.java index c915c93..5696b8b 100644 --- a/src/core/process/C_TeacherSearchStudent.java +++ b/src/core/process/C_TeacherSearchStudent.java @@ -48,18 +48,11 @@ public class C_TeacherSearchStudent extends TempProcess { limits.put("id",this.getStudentId()); search.addOptions("limits",limits); search.addOptions("start",0); - search.addOptions("end",1); + search.addOptions("end",10); Map options = search.execute(null); List result = (List) options.get("result"); List> studentsInfo = new ArrayList<>(); - for(String[] s:result){ - Map studentInfo = new HashMap<>(); - studentInfo.put("id",s[0]); - studentInfo.put("name",s[2]); - studentInfo.put("e_mail_location",s[3]); - studentInfo.put("phone_number",s[4]); - studentsInfo.add(studentInfo); - } + core.process.Utils.formatResult(result, studentsInfo); return studentsInfo; } protected boolean check() { diff --git a/src/core/process/C_TeacherSelectStudent.java b/src/core/process/C_TeacherSelectStudent.java index 643b493..42624c6 100644 --- a/src/core/process/C_TeacherSelectStudent.java +++ b/src/core/process/C_TeacherSelectStudent.java @@ -1,5 +1,6 @@ package core.process; +import core.operation.Search; import core.operation.Select; import error.GExcptInit; @@ -20,6 +21,24 @@ public class C_TeacherSelectStudent extends TempProcess { select.addOptions("student_id",this.getStudentId()); Map options=select.execute(null); } + public List> search(String studentId) throws Exception{ + Search search = new Search() ; + search.setOptions(new HashMap<>()); + search.addOptions("table","student"); + List fields = new ArrayList<>(); + fields.add("*"); + search.addOptions("field",fields); + Map limits = new HashMap<>(); + limits.put("id",studentId); + search.addOptions("limits",limits); + search.addOptions("start",0); + search.addOptions("end",10); + Map options = search.execute(null); + List result = (List) options.get("result"); + List> studentsInfo = new ArrayList<>(); + core.process.Utils.formatResult(result, studentsInfo); + return studentsInfo; + } protected boolean check() { if(this.getStudentId()==null||this.getTeacherId()==null) return false; diff --git a/src/core/process/Utils.java b/src/core/process/Utils.java new file mode 100644 index 0000000..9c1fc12 --- /dev/null +++ b/src/core/process/Utils.java @@ -0,0 +1,18 @@ +package core.process; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public interface Utils { + static void formatResult(List result, List> studentsInfo) { + for(String[] s:result){ + Map studentInfo = new HashMap<>(); + studentInfo.put("id",s[0]); + studentInfo.put("name",s[2]); + studentInfo.put("e_mail_location",s[3]); + studentInfo.put("phone_number",s[4]); + studentsInfo.add(studentInfo); + } + } +} diff --git a/src/filter/OnlineCheck.java b/src/filter/OnlineCheck.java index e6e1ec4..7ebadb6 100644 --- a/src/filter/OnlineCheck.java +++ b/src/filter/OnlineCheck.java @@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebFilter(filterName = "OnlineCheck",urlPatterns = "/home.jsp") +@WebFilter(filterName = "OnlineCheck",urlPatterns = "/home*") public class OnlineCheck implements Filter { public void destroy() { } diff --git a/src/gdms/Configuration.java b/src/gdms/Configuration.java index 4128db3..3143a95 100644 --- a/src/gdms/Configuration.java +++ b/src/gdms/Configuration.java @@ -2,7 +2,7 @@ package gdms; public interface Configuration { //file - String filePath = "/"; + String filePath = "C:/Users/zhai_/Desktop/"; //database String dbUrl="jdbc:mariadb://localhost:3306/gdms"; String dbUsername="gdms"; diff --git a/src/servlet/S_StudentSelectTeacher.java b/src/servlet/S_StudentSelectTeacher.java index 69b8893..95a8fce 100644 --- a/src/servlet/S_StudentSelectTeacher.java +++ b/src/servlet/S_StudentSelectTeacher.java @@ -26,4 +26,5 @@ public class S_StudentSelectTeacher extends HttpServlet { response.sendRedirect("/op_fail.jsp"); } } + } diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java index b7271e4..393a567 100644 --- a/src/servlet/S_StudentUploadFinishedProduct.java +++ b/src/servlet/S_StudentUploadFinishedProduct.java @@ -8,22 +8,19 @@ 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"; protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - String id = "000"; - //String files = request.getParameter("file"); - System.out.print("123"); - System.out.print( request.getPart("file")); - System.out.print("123"); + String id = request.getParameter("id"); + String fileURL; try { - String fileURL = servlet.Utils.saveFile(request, fileType); + fileURL = servlet.Utils.saveFile(request, fileType); }catch (Exception e) { System.out.print(e); + response.sendRedirect("/op_fail.jsp"); } - System.out.print("222"); } } diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js index 866ac3a..7f0de15 100644 --- a/web/jsFile/upload_action.js +++ b/web/jsFile/upload_action.js @@ -5,7 +5,7 @@ $(document).ready(function () { }) function sendFile() { var fileData =new FormData(); - var Url4='student-upload-finished-product'; + var Url4='/student-upload-finished-product'; var file=$('#select')[0].files[0]; if($('.true-select').val()=='') { From 6aee5b693ac4c74f3f3076157c6c08deacb4ae2e Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 16:11:33 +0800 Subject: [PATCH 15/28] Merge remote-tracking branch 'remotes/origin/hechu1' # Conflicts: # src/core/process/C_TeacherSearchStudent.java # web/jsFile/upload_action.js --- src/core/process/Condition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/process/Condition.java b/src/core/process/Condition.java index 14c5986..9365dbb 100644 --- a/src/core/process/Condition.java +++ b/src/core/process/Condition.java @@ -3,7 +3,7 @@ package core.process; import java.util.ArrayList; import java.util.List; -public class Condition {//条件 +public class Condition { public List getProcesses() { return processes; } From adbb0795d8c90f1ec199ce3026c255eb40b8ad63 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Tue, 15 Jan 2019 16:32:25 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0iconurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...c8301.corrupted.20190114-065036.reason.txt | 22 + ...b3e917bc8301.corrupted.20190114-065036.xml | 2144 +++++++++++++++++ 2 files changed, 2166 insertions(+) create mode 100644 .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt create mode 100644 .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt new file mode 100644 index 0000000..cf4b29f --- /dev/null +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt @@ -0,0 +1,22 @@ +com.intellij.database.serialization.ImportException: RDBMS is not specified int the model file + at com.intellij.database.serialization.ModelImporter.deserializeModel(ModelImporter.java:57) + at com.intellij.database.serialization.ModelSerializerKt.deserialize(ModelSerializer.kt:37) + at com.intellij.database.serialization.ModelSerializerKt.deserialize(ModelSerializer.kt:27) + at com.intellij.database.dataSource.DataSourceStorage.readModel(DataSourceStorage.java:683) + at com.intellij.database.dataSource.DataSourceStorage.readModel(DataSourceStorage.java:671) + at com.intellij.database.dataSource.DataSourceStorage.loadModels(DataSourceStorage.java:488) + at com.intellij.database.dataSource.DataSourceStorage.access$000(DataSourceStorage.java:90) + at com.intellij.database.dataSource.DataSourceStorage$2.run(DataSourceStorage.java:398) + at com.intellij.openapi.progress.impl.CoreProgressManager$TaskRunnable.run(CoreProgressManager.java:736) + at com.intellij.openapi.progress.impl.CoreProgressManager.lambda$runProcess$1(CoreProgressManager.java:157) + at com.intellij.openapi.progress.impl.CoreProgressManager.registerIndicatorAndRun(CoreProgressManager.java:580) + at com.intellij.openapi.progress.impl.CoreProgressManager.executeProcessUnderProgress(CoreProgressManager.java:525) + at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:85) + at com.intellij.openapi.progress.impl.CoreProgressManager.runProcess(CoreProgressManager.java:144) + at com.intellij.openapi.progress.impl.CoreProgressManager$4.run(CoreProgressManager.java:395) + at com.intellij.openapi.application.impl.ApplicationImpl$1.run(ApplicationImpl.java:314) + at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) + at java.util.concurrent.FutureTask.run(FutureTask.java:266) + at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) + at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) + at java.lang.Thread.run(Thread.java:745) diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml new file mode 100644 index 0000000..3473dc6 --- /dev/null +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml @@ -0,0 +1,2144 @@ + + + + + 10.3.10 + MARIADB + InnoDB + lower/lower + + + 1 + 1 + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + latin1_swedish_ci + + + utf8_general_ci + + + armscii8 + 0 + + + armscii8 + 1 + + + armscii8 + 0 + + + armscii8 + 0 + + + ascii + 0 + + + ascii + 1 + + + ascii + 0 + + + ascii + 0 + + + big5 + 0 + + + big5 + 1 + + + big5 + 0 + + + big5 + 0 + + + binary + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 1 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1256 + 0 + + + cp1256 + 1 + + + cp1256 + 0 + + + cp1256 + 0 + + + cp1257 + 0 + + + cp1257 + 1 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp850 + 0 + + + cp850 + 1 + + + cp850 + 0 + + + cp850 + 0 + + + cp852 + 0 + + + cp852 + 1 + + + cp852 + 0 + + + cp852 + 0 + + + cp866 + 0 + + + cp866 + 1 + + + cp866 + 0 + + + cp866 + 0 + + + cp932 + 0 + + + cp932 + 1 + + + cp932 + 0 + + + cp932 + 0 + + + dec8 + 0 + + + dec8 + 0 + + + dec8 + 1 + + + dec8 + 0 + + + eucjpms + 0 + + + eucjpms + 1 + + + eucjpms + 0 + + + eucjpms + 0 + + + euckr + 0 + + + euckr + 1 + + + euckr + 0 + + + euckr + 0 + + + gb2312 + 0 + + + gb2312 + 1 + + + gb2312 + 0 + + + gb2312 + 0 + + + gbk + 0 + + + gbk + 1 + + + gbk + 0 + + + gbk + 0 + + + geostd8 + 0 + + + geostd8 + 1 + + + geostd8 + 0 + + + geostd8 + 0 + + + greek + 0 + + + greek + 1 + + + greek + 0 + + + greek + 0 + + + hebrew + 0 + + + hebrew + 1 + + + hebrew + 0 + + + hebrew + 0 + + + hp8 + 0 + + + hp8 + 1 + + + hp8 + 0 + + + hp8 + 0 + + + keybcs2 + 0 + + + keybcs2 + 1 + + + keybcs2 + 0 + + + keybcs2 + 0 + + + koi8r + 0 + + + koi8r + 1 + + + koi8r + 0 + + + koi8r + 0 + + + koi8u + 0 + + + koi8u + 1 + + + koi8u + 0 + + + koi8u + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 1 + + + latin1 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 1 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin5 + 0 + + + latin5 + 0 + + + latin5 + 1 + + + latin5 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 1 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + macce + 0 + + + macce + 1 + + + macce + 0 + + + macce + 0 + + + macroman + 0 + + + macroman + 1 + + + macroman + 0 + + + macroman + 0 + + + sjis + 0 + + + sjis + 1 + + + sjis + 0 + + + sjis + 0 + + + swe7 + 0 + + + swe7 + 0 + + + swe7 + 1 + + + swe7 + 0 + + + tis620 + 0 + + + tis620 + 0 + + + tis620 + 1 + + + tis620 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 1 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ujis + 0 + + + ujis + 1 + + + ujis + 0 + + + ujis + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 1 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16le + 0 + + + utf16le + 1 + + + utf16le + 0 + + + utf16le + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 1 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 1 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 1 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + 管理员 +
+ + 公告 +
+ + 毕业设计 +
+ + 毕设论文 +
+ + 指导老师评定成绩 +
+ + 评阅老师对论文的评审成绩 +
+ + 毕业设计信息 +
+ + 开题报告 +
+ + 开题报告会纪要 +
+ + 答辩 +
+ + 答辩记录表 +
+ + 开题报告秘书组 +
+ + 开题报告老师组 +
+ + 专业信息 +
+ + 答辩秘书小组 +
+ + 答辩教师组 +
+ + 学生用户 +
+ + 老师用户 +
+ + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + varchar(255)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + char(1)|0s + normal + + + 5 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + int(11)|0s + normal + + + 3 + date|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + text|0s + normal + + + 6 + text|0s + normal + + + 7 + text|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + float|0s + normal + + + 3 + float|0s + normal + + + 4 + float|0s + normal + + + 5 + float|0s + normal + + + 6 + float|0s + normal + + + 7 + float|0s + normal + + + 8 + float|0s + normal + + + 9 + float|0s + normal + + + 10 + float|0s + normal + + + 11 + float|0s + normal + + + 12 + float|0s + normal + + + 13 + float|0s + normal + + + 14 + float|0s + normal + + + 15 + float|0s + normal + + + 16 + float|0s + normal + + + 17 + text|0s + normal + + + 18 + date|0s + normal + + + 19 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + float|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + varchar(255)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + text|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(20)|0s + normal + + + 7 + int(11)|0s + normal + + + 8 + char(1)|0s + normal + + + 9 + char(1)|0s + normal + + + 10 + char(1)|0s + normal + + + 11 + char(1)|0s + normal + + + 12 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + date|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + text|0s + normal + + + 7 + date|0s + normal + + + 8 + text|0s + normal + + + 9 + date|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + char(20)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + date|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + text|0s + normal + + + 7 + float|0s + normal + + + 8 + date|0s + normal + + + 9 + text|0s + normal + + + 10 + float|0s + normal + + + 11 + date|0s + normal + + + 12 + text|0s + normal + + + 13 + float|0s + normal + + + 14 + date|0s + normal + + + 15 + char(1)|0s + normal + + + 16 + char(1)|0s + normal + + + 17 + char(1)|0s + normal + + + 18 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(8)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 1 + profession_code + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(4)|0s + normal + + + 7 + char(8)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + varchar(255)|0s + normal + + + 8 + char(8)|0s + normal + + + 1 + id + 1 + + + \ No newline at end of file From 4fe5018fe4d303f909b79cf880d2a524b36cabcc Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Tue, 15 Jan 2019 16:33:10 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E5=A2=9E=E5=8A=A0iconurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/vcs.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 8306744..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file From 564dfcc57ac0b16a84d569566deef0fcd419ffc5 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 16:46:44 +0800 Subject: [PATCH 18/28] Merge remote-tracking branch 'remotes/origin/wmj' into zgl # Conflicts: # .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml --- src/core/process/C_CollegeFillScoreOpinion.java | 2 +- src/core/process/C_MentorFillOpeningReportOpinion.java | 2 +- src/core/process/C_MentorFillReview.java | 2 +- src/core/process/C_ReviewerFillReview.java | 2 +- src/core/process/C_SchoolFillScoreOpinion.java | 2 +- src/core/process/C_SecretaryFillOpeningReportOpinion.java | 2 +- src/core/process/C_SecretaryFillReplyRecord.java | 2 +- src/core/process/C_StudentSelectTeacher.java | 2 +- src/core/process/C_StudentUploadFinishedProduct.java | 2 +- src/core/process/C_StudentUploadOpeningReport.java | 2 +- src/core/process/C_TeacherTeamFillOpeningReportOpinion.java | 2 +- src/core/process/C_TeacherTeamFillScoreOpinion.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java index 7a95609..35905b2 100644 --- a/src/core/process/C_CollegeFillScoreOpinion.java +++ b/src/core/process/C_CollegeFillScoreOpinion.java @@ -13,7 +13,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="学院老师评分"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index a63308b..d7b9767 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -13,7 +13,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="导师开题意见"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_opening_report_opinion_record"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java index fb9c53a..c20ba27 100644 --- a/src/core/process/C_MentorFillReview.java +++ b/src/core/process/C_MentorFillReview.java @@ -13,7 +13,7 @@ public class C_MentorFillReview extends TempProcess { public String graduationDesignId; public Map vMap; private static String buttonName ="指导老师评阅"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_finished_product_mentor_score"; public void teacherTeamFillOpeningReportOpinion() throws Exception{ diff --git a/src/core/process/C_ReviewerFillReview.java b/src/core/process/C_ReviewerFillReview.java index c7bd9f2..b8245bb 100644 --- a/src/core/process/C_ReviewerFillReview.java +++ b/src/core/process/C_ReviewerFillReview.java @@ -12,7 +12,7 @@ public class C_ReviewerFillReview extends TempProcess { public String graduationDesignId; public Map vMap; private static String buttonName ="评阅老师评阅"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_finished_product_reviewer_score"; diff --git a/src/core/process/C_SchoolFillScoreOpinion.java b/src/core/process/C_SchoolFillScoreOpinion.java index 169bd3c..04ff39b 100644 --- a/src/core/process/C_SchoolFillScoreOpinion.java +++ b/src/core/process/C_SchoolFillScoreOpinion.java @@ -13,7 +13,7 @@ public class C_SchoolFillScoreOpinion extends TempProcess { String graduationDesignId; Map vMap; private static String buttonName ="学院老师评分"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_SecretaryFillOpeningReportOpinion.java b/src/core/process/C_SecretaryFillOpeningReportOpinion.java index 259c64d..bcb65a5 100644 --- a/src/core/process/C_SecretaryFillOpeningReportOpinion.java +++ b/src/core/process/C_SecretaryFillOpeningReportOpinion.java @@ -13,7 +13,7 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="提交开题纪要"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_opening_report_opinion_record"; diff --git a/src/core/process/C_SecretaryFillReplyRecord.java b/src/core/process/C_SecretaryFillReplyRecord.java index b98ee8a..a49b405 100644 --- a/src/core/process/C_SecretaryFillReplyRecord.java +++ b/src/core/process/C_SecretaryFillReplyRecord.java @@ -13,7 +13,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="提交答辩记录"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_reply_opinion_record_score"; diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index b85e6a8..97c1759 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -12,7 +12,7 @@ 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"; public void select()throws Exception{ if(!check()) throw new GExcptInit("ID Attrs init error!"); diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java index 78a1652..55e7207 100644 --- a/src/core/process/C_StudentUploadFinishedProduct.java +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -12,7 +12,7 @@ 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"; static String file_type = "finished_product"; public void uploadOpeningReport() throws Exception{ diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java index 3ea9ea7..f8bbb54 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -12,7 +12,7 @@ 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"; public void uploadOpeningReport() throws Exception{ if(!check()) throw new GExcptInit("Upload OpeningReport Attrs init error!"); diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java index 7f837ac..bb70fcd 100644 --- a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java +++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java @@ -13,7 +13,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="开题小组意见"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_opening_report_opinion_record"; diff --git a/src/core/process/C_TeacherTeamFillScoreOpinion.java b/src/core/process/C_TeacherTeamFillScoreOpinion.java index 036aeda..35a48b3 100644 --- a/src/core/process/C_TeacherTeamFillScoreOpinion.java +++ b/src/core/process/C_TeacherTeamFillScoreOpinion.java @@ -11,7 +11,7 @@ import java.util.Map; public class C_TeacherTeamFillScoreOpinion extends TempProcess { private static String buttonName = "答辩小组评分"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; String graduationDesignId; Map vMap; From a0c88902e5531f44d4192e4472524edd266fe174 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 17:33:53 +0800 Subject: [PATCH 19/28] Merge remote-tracking branch 'remotes/origin/hechu1' # Conflicts: # GDMS.iml --- .idea/artifacts/GDMS_war_exploded.xml | 14 +++------- .idea/dataSources.xml | 2 +- .idea/encodings.xml | 4 --- .idea/misc.xml | 2 +- .idea/vcs.xml | 1 + GDMS.iml | 27 +++++-------------- .../C_StudentUploadFinishedProduct.java | 2 +- src/core/process/ProcessManagement.java | 11 +++++--- src/core/user/User.java | 7 +++++ src/core/user/utils/AccountManagement.java | 15 ++++++++++- src/dao/DBManagement.java | 6 +++++ src/filter/OnlineCheck.java | 2 +- src/gdms/test.java | 8 +++--- web/jsFile/search.js | 2 +- 14 files changed, 54 insertions(+), 49 deletions(-) delete mode 100644 .idea/encodings.xml diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml index d1033ca..6d1dc1a 100644 --- a/.idea/artifacts/GDMS_war_exploded.xml +++ b/.idea/artifacts/GDMS_war_exploded.xml @@ -1,17 +1,11 @@ - - $PROJECT_DIR$/out/artifacts/GDMS_war_exploded + + $PROJECT_DIR$/out/artifacts/gdms_war_exploded - + - - - - - - - + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index c685b63..81ea5c7 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,7 +1,7 @@ - + mariadb true org.mariadb.jdbc.Driver diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 15a15b2..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index df60b67..e0844bc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..8306744 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/GDMS.iml b/GDMS.iml index 8e4eff1..35bf961 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -9,36 +9,21 @@ - - - - + + + - - - + + - - - - - - - - - - - - - - + diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java index fbbd9b9..f6d642d 100644 --- a/src/core/process/C_StudentUploadFinishedProduct.java +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -7,7 +7,7 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -public class C_StudentUploadFinishedProduct { +public class C_StudentUploadFinishedProduct extends TempProcess{ File finishedProduct; String graduationDesignId; diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index ee0fae9..de01c98 100644 --- a/src/core/process/ProcessManagement.java +++ b/src/core/process/ProcessManagement.java @@ -35,8 +35,8 @@ public class ProcessManagement { Map userTables = DBManagement.getUserStatusTables(user.getType()); String graduationDesignId = null; for(Map.Entry entry:userTables.entrySet()){ - String[] ti = entry.getKey().split("."); - String[] ts = entry.getValue().split("."); + String[] ti = entry.getKey().split("\\."); + String[] ts = entry.getValue().split("\\."); List ls = new ArrayList<>(); ls.add("id"); Map limits = new HashMap<>(); @@ -55,6 +55,11 @@ public class ProcessManagement { return status; } public static Process getProcess(String process){ - return null; + switch (process){ + case "finished_product_status": + return new C_StudentUploadFinishedProduct(); + default: + return null; + } } } diff --git a/src/core/user/User.java b/src/core/user/User.java index 236c2ae..b848a3c 100644 --- a/src/core/user/User.java +++ b/src/core/user/User.java @@ -1,8 +1,10 @@ package core.user; import core.process.Condition; +import core.process.ProcessManagement; import core.user.userFun.AccountManageable; import core.user.userFun.ProcessConfigurable; +import core.user.utils.AccountManagement; import java.util.List; import java.util.Map; @@ -115,4 +117,9 @@ public abstract class User implements AccountManageable, ProcessConfigurable{ this.setE_mail_location(vMap.get("e_mail_location")); this.setPhone_number(vMap.get("phone_number")); } + + + public void initCondition() throws Exception { + this.condition = ProcessManagement.getCondition(this); + } } diff --git a/src/core/user/utils/AccountManagement.java b/src/core/user/utils/AccountManagement.java index f832674..223b3dc 100644 --- a/src/core/user/utils/AccountManagement.java +++ b/src/core/user/utils/AccountManagement.java @@ -1,5 +1,6 @@ package core.user.utils; +import core.user.Student; import core.user.User; import core.utils.GetObjectByName; import dao.DBManagement; @@ -49,7 +50,12 @@ public interface AccountManagement { } static User register(String userType, Map vMap) throws Exception { DBManagement.insert(userType,vMap); - return createUser(userType, vMap); + + User user = createUser(userType, vMap); + if(userType=="student"){ + //initAllStatus((Student) user); + } + return user; } static void logout(User user){ //todo @@ -60,6 +66,13 @@ public interface AccountManagement { static User createUser(String userType, Map vMap) throws Exception { User user = GetObjectByName.getUserByName(userType); user.setAttr(vMap); + user.initCondition(); return user; } + String defaultStatus = "1"; + static void initAllStatus(String id){ + for(Map.Entry entry:DBManagement.allStatus.entrySet()){ + + } + } } diff --git a/src/dao/DBManagement.java b/src/dao/DBManagement.java index 23c8ec5..d5cd7ee 100644 --- a/src/dao/DBManagement.java +++ b/src/dao/DBManagement.java @@ -87,6 +87,12 @@ public class DBManagement { put("graduation_design_reply_opinion_record_score.reply_school_teacher_id","graduation_design_reply_opinion_record_score.reply_school_score_status"); } }; + public static Map allStatus = new HashMap<>(){ + { + put("graduation_design","teacher_choose_student_status"); + put("graduation_design",""); + } + }; public static String driverClassName="org.mariadb.jdbc.Driver"; diff --git a/src/filter/OnlineCheck.java b/src/filter/OnlineCheck.java index 7ebadb6..222b4dc 100644 --- a/src/filter/OnlineCheck.java +++ b/src/filter/OnlineCheck.java @@ -6,7 +6,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -@WebFilter(filterName = "OnlineCheck",urlPatterns = "/home*") +@WebFilter(filterName = "OnlineCheck",urlPatterns = "/home/*") public class OnlineCheck implements Filter { public void destroy() { } diff --git a/src/gdms/test.java b/src/gdms/test.java index 55dbfa0..8aa8764 100644 --- a/src/gdms/test.java +++ b/src/gdms/test.java @@ -11,11 +11,9 @@ import java.util.Map; public class test { public static void main(String[] args){ - int i=0; - do{ - i++; - System.out.println(i); - }while(i<3); + String s = "graduation_design_finished_product_reviewer_score.reviewer_teacher_id"; + String[] ss = s.split("\\."); + System.out.println(ss[0]); } static void changeB(String a){ diff --git a/web/jsFile/search.js b/web/jsFile/search.js index 67502ca..25a1a4f 100644 --- a/web/jsFile/search.js +++ b/web/jsFile/search.js @@ -63,5 +63,5 @@ function studentSelect() { } function teacherSelect() { var button=$(this); - select_one("testfrom.jsp",button); + select_one("/home/teacher-select-student",button); } \ No newline at end of file From 6b6b333f46f60cac25e0d54dd55e3fbce69a6917 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Tue, 15 Jan 2019 17:37:52 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E5=AE=8C=E5=96=84process?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/process/C_MentorFillReview.java | 3 +- src/core/process/C_StudentSelectTeacher.java | 1 - .../C_StudentUploadFinishedProduct.java | 2 +- .../process/C_StudentUploadOpeningReport.java | 1 - src/core/process/ProcessManagement.java | 34 ++++++++++++++++++- 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java index 1da074f..49c6402 100644 --- a/src/core/process/C_MentorFillReview.java +++ b/src/core/process/C_MentorFillReview.java @@ -13,10 +13,9 @@ public class C_MentorFillReview extends TempProcess { public String graduationDesignId; public Map vMap; private static String buttonName ="指导老师评阅"; - protected static String iconURL="\"../cssFile/images/fill.png\""; protected static String targetURL="/home/mentor-fill-review"; - protected static String iconURL="../cssFile/images/fill.png"; + static String table="graduation_design_finished_product_mentor_score"; public void teacherTeamFillOpeningReportOpinion() throws Exception{ diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index 3577a9d..2a42db7 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -12,7 +12,6 @@ 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 targetURL="/home/student-select-teacher"; protected static String iconURL="../cssFile/images/select.png"; diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java index 78e9d17..8bb0ea3 100644 --- a/src/core/process/C_StudentUploadFinishedProduct.java +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -7,7 +7,7 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -public class C_StudentUploadFinishedProduct { +public class C_StudentUploadFinishedProduct extends TempProcess { File finishedProduct; String graduationDesignId; diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java index 0c5ec47..3ccb7e3 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -12,7 +12,6 @@ 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 targetURL="/home/student-upload-opening-report"; protected static String iconURL="../cssFile/images/upload.png"; diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index ee0fae9..a961f10 100644 --- a/src/core/process/ProcessManagement.java +++ b/src/core/process/ProcessManagement.java @@ -55,6 +55,38 @@ public class ProcessManagement { return status; } public static Process getProcess(String process){ - return null; + switch (process) { + case "teacher_choose_student_status": + return new C_TeacherSelectStudent(); + case "student_choose_teacher_status": + return new C_StudentSelectTeacher(); + case"student_fill_graduation_design_information_status": + return new C_StudentFillGraduationDesignInformation(); + case"opening_report_status": + return new C_StudentUploadOpeningReport(); + case"opening_report_mentor_opinion_status": + return new C_MentorFillOpeningReportOpinion(); + case"opening_report_teacher_team_opinion_status": + return new C_TeacherTeamFillOpeningReportOpinion(); + case"opening_report_college_opinion_status": + return new C_CollegeFillOpeningReportOpinion(); + case"opening_report_secretary_record_status": + return new C_SecretaryFillOpeningReportRecord(); + case"finished_product_status": + return new C_StudentUploadFinishedProduct(); + case"finished_product_mentor_score_status": + return new C_MentorFillReview(); + case"finished_product_reviewer_score_status": + return new C_ReviewerFillReview(); + case"reply_ secretary_record_status": + return new C_SecretaryFillReplyRecord(); + case"reply_ teacher_team_score_status": + return new C_TeacherFillTeamFillScoreOpinion(); + case"reply_college_score_status": + return new C_CollegeFillScoreOpinion(); + case"reply_school_score_status": + return new C_SchoolFillScoreOpinion(); + + } } } From 8af0c704a84ed09cbfa5b6eb2bcf8a2044150b01 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Tue, 15 Jan 2019 17:41:33 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9iconurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/process/C_MentorFillOpeningReportOpinion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index a199795..2c8d671 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -13,7 +13,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map 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"; protected static String iconURL="../cssFile/images/fill.png"; From ea7a6c6537946371555107b319550df4c447806c Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 17:44:21 +0800 Subject: [PATCH 22/28] Merge remote-tracking branch 'remotes/origin/hechu1' # Conflicts: # GDMS.iml --- .idea/artifacts/gdms_Web_exploded.xml | 16 ---------------- src/core/operation/Delete.java | 4 +--- src/core/operation/Select.java | 8 +++----- src/core/user/utils/AccountManagement.java | 9 ++++++--- 4 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 .idea/artifacts/gdms_Web_exploded.xml diff --git a/.idea/artifacts/gdms_Web_exploded.xml b/.idea/artifacts/gdms_Web_exploded.xml deleted file mode 100644 index 00e9edf..0000000 --- a/.idea/artifacts/gdms_Web_exploded.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/gdms_Web_exploded - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core/operation/Delete.java b/src/core/operation/Delete.java index f9e7acd..678aeaf 100644 --- a/src/core/operation/Delete.java +++ b/src/core/operation/Delete.java @@ -12,9 +12,7 @@ public class Delete extends Operation { public Map execute(User subject) throws GExcptSQL { Map map = new HashMap<>(); map.put("id",(String)this.getOptions().get("id")); - for(String table:DBManagement.graduationDesignTables){ - DBManagement.delete(table,map); - } + //todo return this.getOptions(); } } diff --git a/src/core/operation/Select.java b/src/core/operation/Select.java index 9d09797..7b5b6ab 100644 --- a/src/core/operation/Select.java +++ b/src/core/operation/Select.java @@ -12,17 +12,15 @@ public class Select extends Operation { @Override public Map execute(User subject) throws GExcptSQL { Map vMap = new HashMap<>(); + Map limits = new HashMap<>(); String id = (String)this.getOptions().get("student_id"); String teacher_id = (String)this.getOptions().get("teacher_id"); - vMap.put("id",id); + limits.put("id",id); vMap.put("student_id",id); vMap.put("teacher_id",teacher_id); - DBManagement.insert("graduation_design", vMap); + DBManagement.update("graduation_design", vMap,limits); vMap.remove("student_id"); vMap.remove("teacher_id"); - for(int i=1;i entry:DBManagement.allStatus.entrySet()){ - + Map vMap = new HashMap<>(); + vMap.put("id",id); + vMap.put(entry.getValue(),defaultStatus); + DBManagement.insert(entry.getKey(),vMap); } } } From 98b8eb8987515ee0abda3b9c00ad17cb495d4573 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 17:44:24 +0800 Subject: [PATCH 23/28] Merge remote-tracking branch 'remotes/origin/wmj' into zgl # Conflicts: # .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml --- .idea/artifacts/GDMS_war_exploded.xml | 13 - .../9ab10673-d584-44a7-a783-8ac833d52c51.xml | 2161 +++++++++++++++++ .idea/encodings.xml | 4 + src/dao/DBManagement.java | 18 +- 4 files changed, 2182 insertions(+), 14 deletions(-) delete mode 100644 .idea/artifacts/GDMS_war_exploded.xml create mode 100644 .idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml create mode 100644 .idea/encodings.xml diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml deleted file mode 100644 index 6d1dc1a..0000000 --- a/.idea/artifacts/GDMS_war_exploded.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/gdms_war_exploded - - - - - - - - - - \ No newline at end of file diff --git a/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml b/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml new file mode 100644 index 0000000..c17251b --- /dev/null +++ b/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml @@ -0,0 +1,2161 @@ + + + + + 10.3.12 + MARIADB + InnoDB + lower/lower + + + 1 + 1 + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + latin1_swedish_ci + + + armscii8 + 0 + + + armscii8 + 1 + + + armscii8 + 0 + + + armscii8 + 0 + + + ascii + 0 + + + ascii + 1 + + + ascii + 0 + + + ascii + 0 + + + big5 + 0 + + + big5 + 1 + + + big5 + 0 + + + big5 + 0 + + + binary + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 1 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1256 + 0 + + + cp1256 + 1 + + + cp1256 + 0 + + + cp1256 + 0 + + + cp1257 + 0 + + + cp1257 + 1 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp850 + 0 + + + cp850 + 1 + + + cp850 + 0 + + + cp850 + 0 + + + cp852 + 0 + + + cp852 + 1 + + + cp852 + 0 + + + cp852 + 0 + + + cp866 + 0 + + + cp866 + 1 + + + cp866 + 0 + + + cp866 + 0 + + + cp932 + 0 + + + cp932 + 1 + + + cp932 + 0 + + + cp932 + 0 + + + dec8 + 0 + + + dec8 + 0 + + + dec8 + 1 + + + dec8 + 0 + + + eucjpms + 0 + + + eucjpms + 1 + + + eucjpms + 0 + + + eucjpms + 0 + + + euckr + 0 + + + euckr + 1 + + + euckr + 0 + + + euckr + 0 + + + gb2312 + 0 + + + gb2312 + 1 + + + gb2312 + 0 + + + gb2312 + 0 + + + gbk + 0 + + + gbk + 1 + + + gbk + 0 + + + gbk + 0 + + + geostd8 + 0 + + + geostd8 + 1 + + + geostd8 + 0 + + + geostd8 + 0 + + + greek + 0 + + + greek + 1 + + + greek + 0 + + + greek + 0 + + + hebrew + 0 + + + hebrew + 1 + + + hebrew + 0 + + + hebrew + 0 + + + hp8 + 0 + + + hp8 + 1 + + + hp8 + 0 + + + hp8 + 0 + + + keybcs2 + 0 + + + keybcs2 + 1 + + + keybcs2 + 0 + + + keybcs2 + 0 + + + koi8r + 0 + + + koi8r + 1 + + + koi8r + 0 + + + koi8r + 0 + + + koi8u + 0 + + + koi8u + 1 + + + koi8u + 0 + + + koi8u + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 1 + + + latin1 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 1 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin5 + 0 + + + latin5 + 0 + + + latin5 + 1 + + + latin5 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 1 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + macce + 0 + + + macce + 1 + + + macce + 0 + + + macce + 0 + + + macroman + 0 + + + macroman + 1 + + + macroman + 0 + + + macroman + 0 + + + sjis + 0 + + + sjis + 1 + + + sjis + 0 + + + sjis + 0 + + + swe7 + 0 + + + swe7 + 0 + + + swe7 + 1 + + + swe7 + 0 + + + tis620 + 0 + + + tis620 + 0 + + + tis620 + 1 + + + tis620 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 1 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ujis + 0 + + + ujis + 1 + + + ujis + 0 + + + ujis + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 1 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16le + 0 + + + utf16le + 1 + + + utf16le + 0 + + + utf16le + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 1 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 1 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 1 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + 管理员 +
+ + 公告 +
+ + 毕业设计 +
+ + 毕设论文 +
+ + 指导老师评定成绩 +
+ + 评阅老师对论文的评审成绩 +
+ + 毕业设计信息 +
+ + 开题报告 +
+ + 开题报告会纪要 +
+ + 答辩 +
+ + 答辩记录表 +
+ + 开题报告秘书组 +
+ + 开题报告老师组 +
+ + 专业信息 +
+ + 答辩秘书小组 +
+ + 答辩教师组 +
+ + 学生用户 +
+ + 老师用户 +
+ + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + varchar(255)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + char(1)|0s + normal + + + 5 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + int(11)|0s + normal + + + 3 + date|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + text|0s + normal + + + 6 + text|0s + normal + + + 7 + text|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + float|0s + normal + + + 3 + float|0s + normal + + + 4 + float|0s + normal + + + 5 + float|0s + normal + + + 6 + float|0s + normal + + + 7 + float|0s + normal + + + 8 + float|0s + normal + + + 9 + float|0s + normal + + + 10 + float|0s + normal + + + 11 + float|0s + normal + + + 12 + float|0s + normal + + + 13 + float|0s + normal + + + 14 + float|0s + normal + + + 15 + float|0s + normal + + + 16 + float|0s + normal + + + 17 + text|0s + normal + + + 18 + date|0s + normal + + + 19 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + float|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + varchar(255)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + text|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(20)|0s + normal + + + 7 + int(11)|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + text|0s + normal + + + 6 + date|0s + normal + + + 7 + text|0s + normal + + + 8 + date|0s + normal + + + 9 + text|0s + normal + + + 10 + date|0s + normal + + + 11 + char(1)|0s + normal + + + 12 + char(1)|0s + normal + + + 13 + char(1)|0s + normal + + + 14 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + char(20)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + text|0s + normal + + + 7 + date|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + date|0s + normal + + + 11 + text|0s + normal + + + 12 + float|0s + normal + + + 13 + date|0s + normal + + + 14 + text|0s + normal + + + 15 + float|0s + normal + + + 16 + date|0s + normal + + + 17 + char(1)|0s + normal + + + 18 + char(1)|0s + normal + + + 19 + char(1)|0s + normal + + + 20 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(8)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 1 + profession_code + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(4)|0s + normal + + + 7 + char(8)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + varchar(255)|0s + normal + + + 8 + char(8)|0s + normal + + + 1 + id + 1 + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/dao/DBManagement.java b/src/dao/DBManagement.java index d5cd7ee..83a1396 100644 --- a/src/dao/DBManagement.java +++ b/src/dao/DBManagement.java @@ -28,6 +28,7 @@ public class DBManagement { "graduation_design_opening_report_opinion_record", "graduation_design_reply", "graduation_design_reply_opinion_record_score" + }; public static String[] studentInfo = { "id", @@ -90,7 +91,22 @@ public class DBManagement { public static Map allStatus = new HashMap<>(){ { put("graduation_design","teacher_choose_student_status"); - put("graduation_design",""); + put("graduation_design","student_choose_teacher_status"); + put("graduation_design_information","student_fill_graduation_design_information_status"); + put("graduation_design_opening_report","opening_report_status"); + put("graduation_design_opening_report_opinion_record","opening_report_mentor_opinion_status"); + put("graduation_design_opening_report_opinion_record","opening_report_teacher_team_opinion_status"); + put("graduation_design_opening_report_opinion_record","opening_report_college_opinion_status"); + put("graduation_design_opening_report_opinion_record","opening_report_secretary_record_status"); + put("graduation_design_finished_product","finished_product_status"); + put("graduation_design_finished_product_mentor_score","finished_product_mentor_score_status"); + put("graduation_design_finished_product_reviewer_score","finished_product_reviewer_score_status"); + put("graduation_design_reply_opinion_record_score","reply_ secretary_record_status"); + put("graduation_design_reply_opinion_record_score","reply_ teacher_team_score_status"); + put("graduation_design_reply_opinion_record_score","reply_college_score_status"); + put("graduation_design_reply_opinion_record_score","reply_school_score_status"); + + } }; public static String driverClassName="org.mariadb.jdbc.Driver"; From 56771ceabdf3a14a2613d93db5130dcc887a4a37 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 17:46:28 +0800 Subject: [PATCH 24/28] Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts. --- ...c8301.corrupted.20190114-065036.reason.txt | 22 + ...b3e917bc8301.corrupted.20190114-065036.xml | 2144 +++++++++++++++++ .../C_CollegeFillOpeningReportOpinion.java | 3 + .../process/C_CollegeFillScoreOpinion.java | 4 + .../C_MentorFillOpeningReportOpinion.java | 4 + src/core/process/C_MentorFillReview.java | 3 + src/core/process/C_ReviewerFillReview.java | 3 + .../process/C_SchoolFillScoreOpinion.java | 3 + .../C_SecretaryFillOpeningReportOpinion.java | 3 + .../process/C_SecretaryFillReplyRecord.java | 3 + ...tudentFillGraduationDesignInformation.java | 3 + src/core/process/C_StudentSelectTeacher.java | 3 + .../C_StudentUploadFinishedProduct.java | 5 +- .../process/C_StudentUploadOpeningReport.java | 2 + src/core/process/C_TeacherSelectStudent.java | 2 + ...C_TeacherTeamFillOpeningReportOpinion.java | 3 + .../C_TeacherTeamFillScoreOpinion.java | 3 +- src/core/process/ProcessManagement.java | 39 +- 18 files changed, 2244 insertions(+), 8 deletions(-) create mode 100644 .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt create mode 100644 .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt new file mode 100644 index 0000000..cf4b29f --- /dev/null +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt @@ -0,0 +1,22 @@ +com.intellij.database.serialization.ImportException: RDBMS is not specified int the model file + at com.intellij.database.serialization.ModelImporter.deserializeModel(ModelImporter.java:57) + at com.intellij.database.serialization.ModelSerializerKt.deserialize(ModelSerializer.kt:37) + at com.intellij.database.serialization.ModelSerializerKt.deserialize(ModelSerializer.kt:27) + at com.intellij.database.dataSource.DataSourceStorage.readModel(DataSourceStorage.java:683) + at com.intellij.database.dataSource.DataSourceStorage.readModel(DataSourceStorage.java:671) + at com.intellij.database.dataSource.DataSourceStorage.loadModels(DataSourceStorage.java:488) + at com.intellij.database.dataSource.DataSourceStorage.access$000(DataSourceStorage.java:90) + at com.intellij.database.dataSource.DataSourceStorage$2.run(DataSourceStorage.java:398) + at com.intellij.openapi.progress.impl.CoreProgressManager$TaskRunnable.run(CoreProgressManager.java:736) + at com.intellij.openapi.progress.impl.CoreProgressManager.lambda$runProcess$1(CoreProgressManager.java:157) + at com.intellij.openapi.progress.impl.CoreProgressManager.registerIndicatorAndRun(CoreProgressManager.java:580) + at com.intellij.openapi.progress.impl.CoreProgressManager.executeProcessUnderProgress(CoreProgressManager.java:525) + at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:85) + at com.intellij.openapi.progress.impl.CoreProgressManager.runProcess(CoreProgressManager.java:144) + at com.intellij.openapi.progress.impl.CoreProgressManager$4.run(CoreProgressManager.java:395) + at com.intellij.openapi.application.impl.ApplicationImpl$1.run(ApplicationImpl.java:314) + at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) + at java.util.concurrent.FutureTask.run(FutureTask.java:266) + at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) + at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) + at java.lang.Thread.run(Thread.java:745) diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml new file mode 100644 index 0000000..3473dc6 --- /dev/null +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml @@ -0,0 +1,2144 @@ + + + + + 10.3.10 + MARIADB + InnoDB + lower/lower + + + 1 + 1 + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + latin1_swedish_ci + + + utf8_general_ci + + + armscii8 + 0 + + + armscii8 + 1 + + + armscii8 + 0 + + + armscii8 + 0 + + + ascii + 0 + + + ascii + 1 + + + ascii + 0 + + + ascii + 0 + + + big5 + 0 + + + big5 + 1 + + + big5 + 0 + + + big5 + 0 + + + binary + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 1 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1256 + 0 + + + cp1256 + 1 + + + cp1256 + 0 + + + cp1256 + 0 + + + cp1257 + 0 + + + cp1257 + 1 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp850 + 0 + + + cp850 + 1 + + + cp850 + 0 + + + cp850 + 0 + + + cp852 + 0 + + + cp852 + 1 + + + cp852 + 0 + + + cp852 + 0 + + + cp866 + 0 + + + cp866 + 1 + + + cp866 + 0 + + + cp866 + 0 + + + cp932 + 0 + + + cp932 + 1 + + + cp932 + 0 + + + cp932 + 0 + + + dec8 + 0 + + + dec8 + 0 + + + dec8 + 1 + + + dec8 + 0 + + + eucjpms + 0 + + + eucjpms + 1 + + + eucjpms + 0 + + + eucjpms + 0 + + + euckr + 0 + + + euckr + 1 + + + euckr + 0 + + + euckr + 0 + + + gb2312 + 0 + + + gb2312 + 1 + + + gb2312 + 0 + + + gb2312 + 0 + + + gbk + 0 + + + gbk + 1 + + + gbk + 0 + + + gbk + 0 + + + geostd8 + 0 + + + geostd8 + 1 + + + geostd8 + 0 + + + geostd8 + 0 + + + greek + 0 + + + greek + 1 + + + greek + 0 + + + greek + 0 + + + hebrew + 0 + + + hebrew + 1 + + + hebrew + 0 + + + hebrew + 0 + + + hp8 + 0 + + + hp8 + 1 + + + hp8 + 0 + + + hp8 + 0 + + + keybcs2 + 0 + + + keybcs2 + 1 + + + keybcs2 + 0 + + + keybcs2 + 0 + + + koi8r + 0 + + + koi8r + 1 + + + koi8r + 0 + + + koi8r + 0 + + + koi8u + 0 + + + koi8u + 1 + + + koi8u + 0 + + + koi8u + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 1 + + + latin1 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 1 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin5 + 0 + + + latin5 + 0 + + + latin5 + 1 + + + latin5 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 1 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + macce + 0 + + + macce + 1 + + + macce + 0 + + + macce + 0 + + + macroman + 0 + + + macroman + 1 + + + macroman + 0 + + + macroman + 0 + + + sjis + 0 + + + sjis + 1 + + + sjis + 0 + + + sjis + 0 + + + swe7 + 0 + + + swe7 + 0 + + + swe7 + 1 + + + swe7 + 0 + + + tis620 + 0 + + + tis620 + 0 + + + tis620 + 1 + + + tis620 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 1 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ujis + 0 + + + ujis + 1 + + + ujis + 0 + + + ujis + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 1 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16le + 0 + + + utf16le + 1 + + + utf16le + 0 + + + utf16le + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 1 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 1 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 1 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + 管理员 +
+ + 公告 +
+ + 毕业设计 +
+ + 毕设论文 +
+ + 指导老师评定成绩 +
+ + 评阅老师对论文的评审成绩 +
+ + 毕业设计信息 +
+ + 开题报告 +
+ + 开题报告会纪要 +
+ + 答辩 +
+ + 答辩记录表 +
+ + 开题报告秘书组 +
+ + 开题报告老师组 +
+ + 专业信息 +
+ + 答辩秘书小组 +
+ + 答辩教师组 +
+ + 学生用户 +
+ + 老师用户 +
+ + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + varchar(255)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + char(1)|0s + normal + + + 5 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + int(11)|0s + normal + + + 3 + date|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + text|0s + normal + + + 6 + text|0s + normal + + + 7 + text|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + float|0s + normal + + + 3 + float|0s + normal + + + 4 + float|0s + normal + + + 5 + float|0s + normal + + + 6 + float|0s + normal + + + 7 + float|0s + normal + + + 8 + float|0s + normal + + + 9 + float|0s + normal + + + 10 + float|0s + normal + + + 11 + float|0s + normal + + + 12 + float|0s + normal + + + 13 + float|0s + normal + + + 14 + float|0s + normal + + + 15 + float|0s + normal + + + 16 + float|0s + normal + + + 17 + text|0s + normal + + + 18 + date|0s + normal + + + 19 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + float|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + varchar(255)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + text|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(20)|0s + normal + + + 7 + int(11)|0s + normal + + + 8 + char(1)|0s + normal + + + 9 + char(1)|0s + normal + + + 10 + char(1)|0s + normal + + + 11 + char(1)|0s + normal + + + 12 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + date|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + text|0s + normal + + + 7 + date|0s + normal + + + 8 + text|0s + normal + + + 9 + date|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + char(20)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + date|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + text|0s + normal + + + 7 + float|0s + normal + + + 8 + date|0s + normal + + + 9 + text|0s + normal + + + 10 + float|0s + normal + + + 11 + date|0s + normal + + + 12 + text|0s + normal + + + 13 + float|0s + normal + + + 14 + date|0s + normal + + + 15 + char(1)|0s + normal + + + 16 + char(1)|0s + normal + + + 17 + char(1)|0s + normal + + + 18 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(8)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 1 + profession_code + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(4)|0s + normal + + + 7 + char(8)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + varchar(255)|0s + normal + + + 8 + char(8)|0s + normal + + + 1 + id + 1 + + + \ No newline at end of file diff --git a/src/core/process/C_CollegeFillOpeningReportOpinion.java b/src/core/process/C_CollegeFillOpeningReportOpinion.java index f2b32b8..81a18e4 100644 --- a/src/core/process/C_CollegeFillOpeningReportOpinion.java +++ b/src/core/process/C_CollegeFillOpeningReportOpinion.java @@ -12,6 +12,9 @@ public class C_CollegeFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="学院开题意见"; + protected static String iconURL="../cssFile/images/fill.png"; + protected static String targetURL="/home/college-fill-opening-report-opinion"; + static String table="graduation_design_opening_report_opinion_record"; public void fillInformation() throws Exception { diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java index d99f190..6758f1c 100644 --- a/src/core/process/C_CollegeFillScoreOpinion.java +++ b/src/core/process/C_CollegeFillScoreOpinion.java @@ -13,6 +13,10 @@ public class C_CollegeFillScoreOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="学院老师评分"; + protected static String iconURL="../cssFile/images/fill.png"; + protected static String targetURL="/home/college-fill-score-opinion"; + + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index 73c355f..2c8d671 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -13,6 +13,10 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="导师开题意见"; + protected static String iconURL="../cssFile/images/fill.png"; + protected static String targetURL="/home/mentor-fill-opening-report-opinion"; + + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_opening_report_opinion_record"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java index 941f81c..49c6402 100644 --- a/src/core/process/C_MentorFillReview.java +++ b/src/core/process/C_MentorFillReview.java @@ -13,6 +13,9 @@ public class C_MentorFillReview extends TempProcess { public String graduationDesignId; public Map vMap; private static String buttonName ="指导老师评阅"; + protected static String targetURL="/home/mentor-fill-review"; + protected static String iconURL="../cssFile/images/fill.png"; + static String table="graduation_design_finished_product_mentor_score"; public void teacherTeamFillOpeningReportOpinion() throws Exception{ diff --git a/src/core/process/C_ReviewerFillReview.java b/src/core/process/C_ReviewerFillReview.java index 3d6bc14..d501066 100644 --- a/src/core/process/C_ReviewerFillReview.java +++ b/src/core/process/C_ReviewerFillReview.java @@ -12,6 +12,9 @@ public class C_ReviewerFillReview extends TempProcess { public String graduationDesignId; public Map 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"; public void TeacherTeamFillOpeningReportOpinion() throws Exception{ diff --git a/src/core/process/C_SchoolFillScoreOpinion.java b/src/core/process/C_SchoolFillScoreOpinion.java index b86ae7a..e512506 100644 --- a/src/core/process/C_SchoolFillScoreOpinion.java +++ b/src/core/process/C_SchoolFillScoreOpinion.java @@ -13,6 +13,9 @@ public class C_SchoolFillScoreOpinion extends TempProcess { String graduationDesignId; Map 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{ if(!check()) throw new GExcptInit("FillInformation Attrs init error!"); diff --git a/src/core/process/C_SecretaryFillOpeningReportOpinion.java b/src/core/process/C_SecretaryFillOpeningReportOpinion.java index 010aa99..a0ad1c7 100644 --- a/src/core/process/C_SecretaryFillOpeningReportOpinion.java +++ b/src/core/process/C_SecretaryFillOpeningReportOpinion.java @@ -13,6 +13,9 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map 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"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_SecretaryFillReplyRecord.java b/src/core/process/C_SecretaryFillReplyRecord.java index 927b6e7..17557dd 100644 --- a/src/core/process/C_SecretaryFillReplyRecord.java +++ b/src/core/process/C_SecretaryFillReplyRecord.java @@ -13,6 +13,9 @@ public class C_SecretaryFillReplyRecord extends TempProcess{ String graduationDesignId; Map 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"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_StudentFillGraduationDesignInformation.java b/src/core/process/C_StudentFillGraduationDesignInformation.java index 2dbc8f3..6462ecf 100644 --- a/src/core/process/C_StudentFillGraduationDesignInformation.java +++ b/src/core/process/C_StudentFillGraduationDesignInformation.java @@ -12,6 +12,9 @@ public class C_StudentFillGraduationDesignInformation extends TempProcess{ String graduationDesignId; Map 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"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index d6b0e93..d4e57ca 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -13,6 +13,9 @@ public class C_StudentSelectTeacher extends TempProcess { String studentId; String teacherId; private static String buttonName ="选择老师"; + protected static String targetURL="/home/student-select-teacher"; + protected static String iconURL="../cssFile/images/select.png"; + public void select()throws Exception{ if(!check()) throw new GExcptInit("ID Attrs init error!"); Select select=new Select(); diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java index f6d642d..8bb0ea3 100644 --- a/src/core/process/C_StudentUploadFinishedProduct.java +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -7,11 +7,14 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -public class C_StudentUploadFinishedProduct extends TempProcess{ +public class C_StudentUploadFinishedProduct extends TempProcess { File finishedProduct; String graduationDesignId; private static String buttonName ="提交定稿"; + 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{ if(!check()) throw new GExcptInit("Upload FinishedProduct Attrs init error!"); diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java index 5e44954..3ccb7e3 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -12,6 +12,8 @@ public class C_StudentUploadOpeningReport extends TempProcess{ String graduationDesignId; private static String buttonName ="提交开题报告"; static String file_type = "opening_report"; + protected static String targetURL="/home/student-upload-opening-report"; + protected static String iconURL="../cssFile/images/upload.png"; public void uploadOpeningReport() throws Exception{ if(!check()) throw new GExcptInit("Upload OpeningReport Attrs init error!"); diff --git a/src/core/process/C_TeacherSelectStudent.java b/src/core/process/C_TeacherSelectStudent.java index dd46bba..acb5021 100644 --- a/src/core/process/C_TeacherSelectStudent.java +++ b/src/core/process/C_TeacherSelectStudent.java @@ -13,6 +13,8 @@ public class C_TeacherSelectStudent extends TempProcess { String studentId; 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!"); diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java index 1461a5f..467dc50 100644 --- a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java +++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java @@ -13,6 +13,9 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map 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"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_TeacherTeamFillScoreOpinion.java b/src/core/process/C_TeacherTeamFillScoreOpinion.java index fd2f20b..8a223a8 100644 --- a/src/core/process/C_TeacherTeamFillScoreOpinion.java +++ b/src/core/process/C_TeacherTeamFillScoreOpinion.java @@ -11,7 +11,8 @@ import java.util.Map; 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 vMap; diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index de01c98..a961f10 100644 --- a/src/core/process/ProcessManagement.java +++ b/src/core/process/ProcessManagement.java @@ -35,8 +35,8 @@ public class ProcessManagement { Map userTables = DBManagement.getUserStatusTables(user.getType()); String graduationDesignId = null; for(Map.Entry entry:userTables.entrySet()){ - String[] ti = entry.getKey().split("\\."); - String[] ts = entry.getValue().split("\\."); + String[] ti = entry.getKey().split("."); + String[] ts = entry.getValue().split("."); List ls = new ArrayList<>(); ls.add("id"); Map limits = new HashMap<>(); @@ -55,11 +55,38 @@ public class ProcessManagement { return status; } public static Process getProcess(String process){ - switch (process){ - case "finished_product_status": + switch (process) { + case "teacher_choose_student_status": + return new C_TeacherSelectStudent(); + case "student_choose_teacher_status": + return new C_StudentSelectTeacher(); + case"student_fill_graduation_design_information_status": + return new C_StudentFillGraduationDesignInformation(); + case"opening_report_status": + return new C_StudentUploadOpeningReport(); + case"opening_report_mentor_opinion_status": + return new C_MentorFillOpeningReportOpinion(); + case"opening_report_teacher_team_opinion_status": + return new C_TeacherTeamFillOpeningReportOpinion(); + case"opening_report_college_opinion_status": + return new C_CollegeFillOpeningReportOpinion(); + case"opening_report_secretary_record_status": + return new C_SecretaryFillOpeningReportRecord(); + case"finished_product_status": return new C_StudentUploadFinishedProduct(); - default: - return null; + case"finished_product_mentor_score_status": + return new C_MentorFillReview(); + case"finished_product_reviewer_score_status": + return new C_ReviewerFillReview(); + case"reply_ secretary_record_status": + return new C_SecretaryFillReplyRecord(); + case"reply_ teacher_team_score_status": + return new C_TeacherFillTeamFillScoreOpinion(); + case"reply_college_score_status": + return new C_CollegeFillScoreOpinion(); + case"reply_school_score_status": + return new C_SchoolFillScoreOpinion(); + } } } From db1069d7c1e90d67f3ab9eaa70c6d609a73af380 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 18:00:01 +0800 Subject: [PATCH 25/28] Merge remote-tracking branch 'remotes/origin/hechu1' # Conflicts: # GDMS.iml --- .idea/uiDesigner.xml | 124 ++++++++++++++++++ .../process/C_CollegeFillScoreOpinion.java | 2 - .../C_MentorFillOpeningReportOpinion.java | 1 - ...> C_SecretaryFillOpeningReportRecord.java} | 2 +- src/core/process/Process.java | 2 +- src/core/process/ProcessManagement.java | 5 +- src/core/user/utils/AccountManagement.java | 7 +- 7 files changed, 132 insertions(+), 11 deletions(-) create mode 100644 .idea/uiDesigner.xml rename src/core/process/{C_SecretaryFillOpeningReportOpinion.java => C_SecretaryFillOpeningReportRecord.java} (96%) diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java index 6758f1c..e15869b 100644 --- a/src/core/process/C_CollegeFillScoreOpinion.java +++ b/src/core/process/C_CollegeFillScoreOpinion.java @@ -15,8 +15,6 @@ public class C_CollegeFillScoreOpinion extends TempProcess{ private static String buttonName ="学院老师评分"; protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/college-fill-score-opinion"; - - protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index 2c8d671..9f5ab53 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -16,7 +16,6 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/mentor-fill-opening-report-opinion"; - protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_opening_report_opinion_record"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_SecretaryFillOpeningReportOpinion.java b/src/core/process/C_SecretaryFillOpeningReportRecord.java similarity index 96% rename from src/core/process/C_SecretaryFillOpeningReportOpinion.java rename to src/core/process/C_SecretaryFillOpeningReportRecord.java index a0ad1c7..011b507 100644 --- a/src/core/process/C_SecretaryFillOpeningReportOpinion.java +++ b/src/core/process/C_SecretaryFillOpeningReportRecord.java @@ -8,7 +8,7 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -public class C_SecretaryFillOpeningReportOpinion extends TempProcess{ +public class C_SecretaryFillOpeningReportRecord extends TempProcess{ String graduationDesignId; Map vMap; diff --git a/src/core/process/Process.java b/src/core/process/Process.java index be06a88..7dc2728 100644 --- a/src/core/process/Process.java +++ b/src/core/process/Process.java @@ -4,7 +4,7 @@ import core.operation.Operation; public abstract class Process{ - private static String buttonName; + protected static String buttonName; protected static String targetURL; protected static String iconURL; diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index a961f10..bbca5e5 100644 --- a/src/core/process/ProcessManagement.java +++ b/src/core/process/ProcessManagement.java @@ -81,12 +81,13 @@ public class ProcessManagement { case"reply_ secretary_record_status": return new C_SecretaryFillReplyRecord(); case"reply_ teacher_team_score_status": - return new C_TeacherFillTeamFillScoreOpinion(); + return new C_TeacherTeamFillScoreOpinion(); case"reply_college_score_status": return new C_CollegeFillScoreOpinion(); case"reply_school_score_status": return new C_SchoolFillScoreOpinion(); - + default: + return null; } } } diff --git a/src/core/user/utils/AccountManagement.java b/src/core/user/utils/AccountManagement.java index 6ab154b..ef5b2c1 100644 --- a/src/core/user/utils/AccountManagement.java +++ b/src/core/user/utils/AccountManagement.java @@ -50,11 +50,10 @@ public interface AccountManagement { } static User register(String userType, Map vMap) throws Exception { DBManagement.insert(userType,vMap); - - User user = createUser(userType, vMap); - if(userType=="student"){ - initAllStatus(user.getId()); + if(userType.equals("student")){ + initAllStatus(vMap.get("id")); } + User user = createUser(userType, vMap); return user; } static void logout(User user){ From ce9ae9956754c382ee40c47007f5a04aeb823167 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 18:01:58 +0800 Subject: [PATCH 26/28] Merge remote-tracking branch 'remotes/origin/hechu1' # Conflicts: # GDMS.iml --- .../9ab10673-d584-44a7-a783-8ac833d52c51.xml | 2164 +++++++++++++++++ web/index.jsp | 16 + 2 files changed, 2180 insertions(+) create mode 100644 .idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml create mode 100644 web/index.jsp diff --git a/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml b/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml new file mode 100644 index 0000000..1d801dc --- /dev/null +++ b/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml @@ -0,0 +1,2164 @@ + + + + + 10.3.10 + MariaDB + InnoDB + lower/lower + + + 1 + 1 + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + latin1_swedish_ci + + + utf8_general_ci + + + armscii8 + 0 + + + armscii8 + 1 + + + armscii8 + 0 + + + armscii8 + 0 + + + ascii + 0 + + + ascii + 1 + + + ascii + 0 + + + ascii + 0 + + + big5 + 0 + + + big5 + 1 + + + big5 + 0 + + + big5 + 0 + + + binary + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 1 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1256 + 0 + + + cp1256 + 1 + + + cp1256 + 0 + + + cp1256 + 0 + + + cp1257 + 0 + + + cp1257 + 1 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp850 + 0 + + + cp850 + 1 + + + cp850 + 0 + + + cp850 + 0 + + + cp852 + 0 + + + cp852 + 1 + + + cp852 + 0 + + + cp852 + 0 + + + cp866 + 0 + + + cp866 + 1 + + + cp866 + 0 + + + cp866 + 0 + + + cp932 + 0 + + + cp932 + 1 + + + cp932 + 0 + + + cp932 + 0 + + + dec8 + 0 + + + dec8 + 0 + + + dec8 + 1 + + + dec8 + 0 + + + eucjpms + 0 + + + eucjpms + 1 + + + eucjpms + 0 + + + eucjpms + 0 + + + euckr + 0 + + + euckr + 1 + + + euckr + 0 + + + euckr + 0 + + + gb2312 + 0 + + + gb2312 + 1 + + + gb2312 + 0 + + + gb2312 + 0 + + + gbk + 0 + + + gbk + 1 + + + gbk + 0 + + + gbk + 0 + + + geostd8 + 0 + + + geostd8 + 1 + + + geostd8 + 0 + + + geostd8 + 0 + + + greek + 0 + + + greek + 1 + + + greek + 0 + + + greek + 0 + + + hebrew + 0 + + + hebrew + 1 + + + hebrew + 0 + + + hebrew + 0 + + + hp8 + 0 + + + hp8 + 1 + + + hp8 + 0 + + + hp8 + 0 + + + keybcs2 + 0 + + + keybcs2 + 1 + + + keybcs2 + 0 + + + keybcs2 + 0 + + + koi8r + 0 + + + koi8r + 1 + + + koi8r + 0 + + + koi8r + 0 + + + koi8u + 0 + + + koi8u + 1 + + + koi8u + 0 + + + koi8u + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 1 + + + latin1 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 1 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin5 + 0 + + + latin5 + 0 + + + latin5 + 1 + + + latin5 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 1 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + macce + 0 + + + macce + 1 + + + macce + 0 + + + macce + 0 + + + macroman + 0 + + + macroman + 1 + + + macroman + 0 + + + macroman + 0 + + + sjis + 0 + + + sjis + 1 + + + sjis + 0 + + + sjis + 0 + + + swe7 + 0 + + + swe7 + 0 + + + swe7 + 1 + + + swe7 + 0 + + + tis620 + 0 + + + tis620 + 0 + + + tis620 + 1 + + + tis620 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 1 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ujis + 0 + + + ujis + 1 + + + ujis + 0 + + + ujis + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 1 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16le + 0 + + + utf16le + 1 + + + utf16le + 0 + + + utf16le + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 1 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 1 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 1 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + 管理员 +
+ + 公告 +
+ + 毕业设计 +
+ + 毕设论文 +
+ + 指导老师评定成绩 +
+ + 评阅老师对论文的评审成绩 +
+ + 毕业设计信息 +
+ + 开题报告 +
+ + 开题报告会纪要 +
+ + 答辩 +
+ + 答辩记录表 +
+ + 开题报告秘书组 +
+ + 开题报告老师组 +
+ + 专业信息 +
+ + 答辩秘书小组 +
+ + 答辩教师组 +
+ + 学生用户 +
+ + 老师用户 +
+ + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + varchar(255)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + char(1)|0s + normal + + + 5 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + int(11)|0s + normal + + + 3 + date|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + text|0s + normal + + + 6 + text|0s + normal + + + 7 + text|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + float|0s + normal + + + 3 + float|0s + normal + + + 4 + float|0s + normal + + + 5 + float|0s + normal + + + 6 + float|0s + normal + + + 7 + float|0s + normal + + + 8 + float|0s + normal + + + 9 + float|0s + normal + + + 10 + float|0s + normal + + + 11 + float|0s + normal + + + 12 + float|0s + normal + + + 13 + float|0s + normal + + + 14 + float|0s + normal + + + 15 + float|0s + normal + + + 16 + float|0s + normal + + + 17 + text|0s + normal + + + 18 + date|0s + normal + + + 19 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + float|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + varchar(255)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + text|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(20)|0s + normal + + + 7 + int(11)|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + text|0s + normal + + + 6 + date|0s + normal + + + 7 + text|0s + normal + + + 8 + date|0s + normal + + + 9 + text|0s + normal + + + 10 + date|0s + normal + + + 11 + char(1)|0s + normal + + + 12 + char(1)|0s + normal + + + 13 + char(1)|0s + normal + + + 14 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + char(20)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + text|0s + normal + + + 7 + date|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + date|0s + normal + + + 11 + text|0s + normal + + + 12 + float|0s + normal + + + 13 + date|0s + normal + + + 14 + text|0s + normal + + + 15 + float|0s + normal + + + 16 + date|0s + normal + + + 17 + char(1)|0s + normal + + + 18 + char(1)|0s + normal + + + 19 + char(1)|0s + normal + + + 20 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(8)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 1 + profession_code + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(4)|0s + normal + + + 7 + char(8)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + varchar(255)|0s + normal + + + 8 + char(8)|0s + normal + + + 1 + id + 1 + + + \ No newline at end of file diff --git a/web/index.jsp b/web/index.jsp new file mode 100644 index 0000000..5c5bf47 --- /dev/null +++ b/web/index.jsp @@ -0,0 +1,16 @@ +<%-- + Created by IntelliJ IDEA. + User: zhai_ + Date: 2019/1/15 + Time: 16:43 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + $Title$ + + + $END$ + + From 55a1d718f1e31773667cd2238f404ce2ac9a301b Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 18:27:28 +0800 Subject: [PATCH 27/28] Merge remote-tracking branch 'remotes/origin/hechu1' # Conflicts: # GDMS.iml --- src/dao/DBManagement.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/dao/DBManagement.java b/src/dao/DBManagement.java index d5cd7ee..f314ac5 100644 --- a/src/dao/DBManagement.java +++ b/src/dao/DBManagement.java @@ -90,7 +90,21 @@ public class DBManagement { public static Map allStatus = new HashMap<>(){ { put("graduation_design","teacher_choose_student_status"); - put("graduation_design",""); + put("graduation_design","student_choose_teacher_status"); + put("graduation_design_information","student_fill_graduation_design_information_status"); + put("graduation_design_opening_report","opening_report_status"); + put("graduation_design_opening_report_opinion_record","opening_report_mentor_opinion_status"); + put("graduation_design_opening_report_opinion_record","opening_report_teacher_team_opinion_status"); + put("graduation_design_opening_report_opinion_record","opening_report_college_opinion_status"); + put("graduation_design_opening_report_opinion_record","opening_report_secretary_record_status"); + put("graduation_design_finished_product","finished_product_status"); + put("graduation_design_finished_product_mentor_score","finished_product_mentor_score_status"); + put("graduation_design_finished_product_reviewer_score","finished_product_reviewer_score_status"); + put("graduation_design_reply_opinion_record_score","reply_ secretary_record_status"); + put("graduation_design_reply_opinion_record_score","reply_ teacher_team_score_status"); + put("graduation_design_reply_opinion_record_score","reply_college_score_status"); + put("graduation_design_reply_opinion_record_score","reply_school_score_status"); + } }; public static String driverClassName="org.mariadb.jdbc.Driver"; From ad7086f650f760962fe9fc8b5056b34b258f1abc Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Tue, 15 Jan 2019 20:07:00 +0800 Subject: [PATCH 28/28] Merge remote-tracking branch 'remotes/origin/zgl' # Conflicts: # .idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml # src/dao/DBManagement.java --- .idea/artifacts/gdms_Web_exploded.xml | 16 + .../9ab10673-d584-44a7-a783-8ac833d52c51.xml | 416 +++++++++++------- src/core/process/ProcessManagement.java | 4 +- src/core/user/utils/AccountManagement.java | 10 +- 4 files changed, 288 insertions(+), 158 deletions(-) create mode 100644 .idea/artifacts/gdms_Web_exploded.xml diff --git a/.idea/artifacts/gdms_Web_exploded.xml b/.idea/artifacts/gdms_Web_exploded.xml new file mode 100644 index 0000000..00e9edf --- /dev/null +++ b/.idea/artifacts/gdms_Web_exploded.xml @@ -0,0 +1,16 @@ + + + $PROJECT_DIR$/out/artifacts/gdms_Web_exploded + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml b/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml index 1d801dc..cf34b4f 100644 --- a/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml +++ b/.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml @@ -1369,796 +1369,904 @@ 老师用户
- + + 898 + + + 772 + + 1 char(20)|0s 1 normal - + 2 char(255)|0s 1 normal - + 3 char(30)|0s normal - + 4 char(40)|0s normal - + 5 char(20)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 text|0s normal - + 3 text|0s normal - + 4 date|0s normal - + 5 varchar(255)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 4 char(1)|0s normal - + 5 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 int(11)|0s normal - + 3 date|0s normal - + 4 varchar(255)|0s normal - + 5 text|0s normal - + 6 text|0s normal - + 7 text|0s normal - + 8 text|0s normal - + 9 float|0s normal - + 10 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 float|0s normal - + 3 float|0s normal - + 4 float|0s normal - + 5 float|0s normal - + 6 float|0s normal - + 7 float|0s normal - + 8 float|0s normal - + 9 float|0s normal - + 10 float|0s normal - + 11 float|0s normal - + 12 float|0s normal - + 13 float|0s normal - + 14 float|0s normal - + 15 float|0s normal - + 16 float|0s normal - + 17 text|0s normal - + 18 date|0s normal - + 19 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 float|0s normal - + 4 text|0s normal - + 5 date|0s normal - + 6 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 varchar(255)|0s normal - + 3 varchar(255)|0s normal - + 4 varchar(255)|0s normal - + 5 varchar(255)|0s normal - + 6 varchar(255)|0s normal - + 7 text|0s normal - + 8 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 date|0s normal - + 3 varchar(255)|0s normal - + 4 varchar(255)|0s normal - + 5 char(20)|0s normal - + 6 char(20)|0s normal - + 7 int(11)|0s normal - + 8 char(1)|0s normal - + + teacher_leader_team_id + btree + + + secretary_leader_team_id + btree + + 1 id 1 - + + teacher_leader_team_id + gdms + opening_report_teacher_team + leader_teacher_id + + + secretary_leader_team_id + gdms + opening_report_secretary_team + leader_student_id + + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 text|0s normal - + 4 date|0s normal - + 5 text|0s normal - + 6 date|0s normal - + 7 text|0s normal - + 8 date|0s normal - + 9 text|0s normal - + 10 date|0s normal - + 11 char(1)|0s normal - + 12 char(1)|0s normal - + 13 char(1)|0s normal - + 14 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 date|0s normal - + 3 varchar(255)|0s normal - + 4 char(20)|0s normal - + 5 char(20)|0s normal - + + teacher_team_leader_id + btree + + + secretary_team_leader_id + btree + + 1 id 1 - + + teacher_team_leader_id + gdms + reply_teacher_team + leader_teacher_id + + + secretary_team_leader_id + gdms + reply_secretary_team + leader_student_id + + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 4 text|0s normal - + 5 date|0s normal - + 6 text|0s normal - + 7 date|0s normal - + 8 text|0s normal - + 9 float|0s normal - + 10 date|0s normal - + 11 text|0s normal - + 12 float|0s normal - + 13 date|0s normal - + 14 text|0s normal - + 15 float|0s normal - + 16 date|0s normal - + 17 char(1)|0s normal - + 18 char(1)|0s normal - + 19 char(1)|0s normal - + 20 char(1)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 1 leader_student_id 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 1 leader_teacher_id 1 - + 1 char(8)|0s 1 normal - + 2 varchar(255)|0s normal - + 3 varchar(255)|0s normal - + 4 varchar(255)|0s normal - + 1 profession_code 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 1 leader_student_id 1 - + 1 char(20)|0s 1 normal - + 2 char(20)|0s normal - + 3 char(20)|0s normal - + 1 leader_teacher_id 1 - + 1 char(20)|0s 1 normal - + 2 char(255)|0s 1 normal - + 3 char(30)|0s normal - + 4 char(40)|0s normal - + 5 char(20)|0s normal - + 6 char(4)|0s normal - + 7 char(8)|0s normal - + 1 id 1 - + 1 char(20)|0s 1 normal - + 2 char(255)|0s 1 normal - + 3 char(30)|0s normal - + 4 char(40)|0s normal - + 5 char(20)|0s normal - + 6 varchar(255)|0s normal - + 7 varchar(255)|0s normal - + 8 char(8)|0s normal - + 1 id 1 + + 1 + char(20)|0s + 1 + + + 2 + char(20)|0s + 1 + + + 3 + char(20)|0s + + + 4 + char(20)|0s + + + 5 + char(20)|0s + 1 + + + 6 + char(20)|0s + + + 7 + char(20)|0s + + + 1 + char(20)|0s + 1 + + + 2 + char(20)|0s + 1 + + + 3 + char(20)|0s + + + 4 + char(20)|0s + + + 5 + char(20)|0s + 1 + + + 6 + char(20)|0s + + + 7 + char(20)|0s + \ No newline at end of file diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index bbca5e5..02f456c 100644 --- a/src/core/process/ProcessManagement.java +++ b/src/core/process/ProcessManagement.java @@ -35,8 +35,8 @@ public class ProcessManagement { Map userTables = DBManagement.getUserStatusTables(user.getType()); String graduationDesignId = null; for(Map.Entry entry:userTables.entrySet()){ - String[] ti = entry.getKey().split("."); - String[] ts = entry.getValue().split("."); + String[] ti = entry.getKey().split("\\."); + String[] ts = entry.getValue().split("\\."); List ls = new ArrayList<>(); ls.add("id"); Map limits = new HashMap<>(); diff --git a/src/core/user/utils/AccountManagement.java b/src/core/user/utils/AccountManagement.java index ef5b2c1..3c03ede 100644 --- a/src/core/user/utils/AccountManagement.java +++ b/src/core/user/utils/AccountManagement.java @@ -70,11 +70,17 @@ public interface AccountManagement { } String defaultStatus = "1"; static void initAllStatus(String id) throws GExcptSQL { - for(Map.Entry entry:DBManagement.allStatus.entrySet()){ + for(String table:DBManagement.graduationDesignTables){ Map vMap = new HashMap<>(); vMap.put("id",id); + DBManagement.insert(table,vMap); + } + for(Map.Entry entry:DBManagement.allStatus.entrySet()){ + Map vMap = new HashMap<>(); + Map limits = new HashMap<>(); + limits.put("id",id); vMap.put(entry.getValue(),defaultStatus); - DBManagement.insert(entry.getKey(),vMap); + DBManagement.update(entry.getKey(),vMap,limits); } } }