diff --git a/.idea/artifacts/GDMS_war_exploded.xml b/.idea/artifacts/GDMS_war_exploded.xml new file mode 100644 index 0000000..d1033ca --- /dev/null +++ b/.idea/artifacts/GDMS_war_exploded.xml @@ -0,0 +1,19 @@ + + + $PROJECT_DIR$/out/artifacts/GDMS_war_exploded + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index bfbb0ff..df60b67 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 d8a6196..8e4eff1 100644 --- a/GDMS.iml +++ b/GDMS.iml @@ -9,25 +9,40 @@ + + + - - - + - + + + - + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/src/core/process/C_CollegeFillOpeningReportOpinion.java b/src/core/process/C_CollegeFillOpeningReportOpinion.java index 27cae0f..f2b32b8 100644 --- a/src/core/process/C_CollegeFillOpeningReportOpinion.java +++ b/src/core/process/C_CollegeFillOpeningReportOpinion.java @@ -11,7 +11,7 @@ import java.util.Map; public class C_CollegeFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; - + private static String buttonName ="学院开题意见"; 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 96e4e7d..d99f190 100644 --- a/src/core/process/C_CollegeFillScoreOpinion.java +++ b/src/core/process/C_CollegeFillScoreOpinion.java @@ -12,7 +12,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{ String graduationDesignId; Map vMap; - + private static String buttonName ="学院老师评分"; static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ @@ -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..73c355f 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -10,8 +10,9 @@ import java.util.Map; public class C_MentorFillOpeningReportOpinion extends TempProcess{ + String graduationDesignId; Map vMap; - + private static String buttonName ="导师开题意见"; static String table="graduation_design_opening_report_opinion_record"; public void fillInformation() throws Exception{ @@ -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 d9a3128..941f81c 100644 --- a/src/core/process/C_MentorFillReview.java +++ b/src/core/process/C_MentorFillReview.java @@ -9,30 +9,13 @@ import java.util.HashMap; import java.util.Map; public class C_MentorFillReview extends TempProcess { - public String teacherID; - public String teacher_opinion; - public Map vMap; + public String graduationDesignId; + public Map vMap; + private static String buttonName ="指导老师评阅"; 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; - } - 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{ + + public void teacherTeamFillOpeningReportOpinion() throws Exception{ if(!check()) throw new GExcptInit("MentorFillReview Attrs init error!"); FillInformation fillInformation=new FillInformation(); fillInformation.setOptions(new HashMap<>()); @@ -41,18 +24,30 @@ 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().equals(null)||this.getTeacher_opinion().equals(null)||this.getvMap().equals(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; + } + public Map getVMap() { + return vMap; + } } diff --git a/src/core/process/C_ReviewerFillReview.java b/src/core/process/C_ReviewerFillReview.java new file mode 100644 index 0000000..3d6bc14 --- /dev/null +++ b/src/core/process/C_ReviewerFillReview.java @@ -0,0 +1,61 @@ +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 graduationDesignId; + public Map vMap; + private static String buttonName ="评阅老师评阅"; + static String table="graduation_design_finished_product_reviewer_score"; + + 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.getGraduationDesignId()); + fillInformation.addOptions("limits",limits); + fillInformation.execute(null); + } + + @Override + protected boolean check() { + 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; + } +} + + + + + + + + + + + diff --git a/src/core/process/C_SchoolFillScoreOpinion.java b/src/core/process/C_SchoolFillScoreOpinion.java index 652cf1b..b86ae7a 100644 --- a/src/core/process/C_SchoolFillScoreOpinion.java +++ b/src/core/process/C_SchoolFillScoreOpinion.java @@ -12,7 +12,7 @@ public class C_SchoolFillScoreOpinion extends TempProcess { String graduationDesignId; Map vMap; - + private static String buttonName ="学院老师评分"; static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ if(!check()) throw new GExcptInit("FillInformation Attrs init error!"); @@ -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..010aa99 100644 --- a/src/core/process/C_SecretaryFillOpeningReportOpinion.java +++ b/src/core/process/C_SecretaryFillOpeningReportOpinion.java @@ -12,7 +12,7 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; - + private static String buttonName ="提交开题纪要"; static String table="graduation_design_opening_report_opinion_record"; public void fillInformation() throws Exception{ @@ -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..927b6e7 100644 --- a/src/core/process/C_SecretaryFillReplyRecord.java +++ b/src/core/process/C_SecretaryFillReplyRecord.java @@ -12,7 +12,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{ String graduationDesignId; Map vMap; - + private static String buttonName ="提交答辩记录"; static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ @@ -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..2dbc8f3 100644 --- a/src/core/process/C_StudentFillGraduationDesignInformation.java +++ b/src/core/process/C_StudentFillGraduationDesignInformation.java @@ -11,7 +11,7 @@ import java.util.Map; public class C_StudentFillGraduationDesignInformation extends TempProcess{ String graduationDesignId; Map vMap; - + private static String buttonName ="填写选题信息"; static String table="graduation_design_opening_report_opinion_record"; public void fillInformation() throws Exception{ @@ -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_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index ee8ada0..bd2e67b 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -11,7 +11,7 @@ import java.util.Map; public class C_StudentSelectTeacher extends TempProcess { String studentId; String teacherId; - + private static String buttonName ="选择老师"; 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 efd36a8..fbbd9b9 100644 --- a/src/core/process/C_StudentUploadFinishedProduct.java +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -11,7 +11,7 @@ public class C_StudentUploadFinishedProduct { File finishedProduct; String graduationDesignId; - + private static String buttonName ="提交定稿"; 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 69c70b3..5e44954 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -10,7 +10,7 @@ import java.util.Map; public class C_StudentUploadOpeningReport extends TempProcess{ File openingReport; String graduationDesignId; - + private static String buttonName ="提交开题报告"; static String file_type = "opening_report"; public void uploadOpeningReport() throws Exception{ diff --git a/src/core/process/C_TeacherSelectStudent.java b/src/core/process/C_TeacherSelectStudent.java index 643b493..1b9f245 100644 --- a/src/core/process/C_TeacherSelectStudent.java +++ b/src/core/process/C_TeacherSelectStudent.java @@ -11,6 +11,7 @@ import java.util.Map; public class C_TeacherSelectStudent extends TempProcess { String studentId; String teacherId; + private static String buttonName ="选择学生"; 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 cc0bf06..1461a5f 100644 --- a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java +++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java @@ -12,7 +12,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; - + private static String buttonName ="开题小组意见"; static String table="graduation_design_opening_report_opinion_record"; public void fillInformation() throws Exception{ @@ -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..fd2f20b 100644 --- a/src/core/process/C_TeacherTeamFillScoreOpinion.java +++ b/src/core/process/C_TeacherTeamFillScoreOpinion.java @@ -10,6 +10,8 @@ import java.util.Map; public class C_TeacherTeamFillScoreOpinion extends TempProcess { + private static String buttonName = "答辩小组评分"; + String graduationDesignId; Map vMap; @@ -29,7 +31,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 +47,7 @@ public class C_TeacherTeamFillScoreOpinion extends TempProcess { public void setVMap(Map vMap) { this.vMap = vMap; } - + public Map getVMap() { + return vMap; + } }