diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index c00abce..c685b63 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/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301/storage_v2/_src_/schema/testsql._Fc3qw.meta b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301/storage_v2/_src_/schema/testsql._Fc3qw.meta deleted file mode 100644 index d645fb8..0000000 --- a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301/storage_v2/_src_/schema/testsql._Fc3qw.meta +++ /dev/null @@ -1,2 +0,0 @@ -#n:testsql -! [null, 0, null, null, -2147483648, -2147483648] diff --git a/.idea/dictionaries/zhai_.xml b/.idea/dictionaries/zhai_.xml deleted file mode 100644 index 3011932..0000000 --- a/.idea/dictionaries/zhai_.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - excpt - gdms - hmmss - mariadb - synchronizable - - - \ No newline at end of file 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/jsonSchemas.xml b/.idea/jsonSchemas.xml deleted file mode 100644 index 8ae97b9..0000000 --- a/.idea/jsonSchemas.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml deleted file mode 100644 index 2310603..0000000 --- a/.idea/libraries/lib.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/tomcat_lib.xml b/.idea/libraries/tomcat_lib.xml deleted file mode 100644 index 569121d..0000000 --- a/.idea/libraries/tomcat_lib.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index f353925..9f494a5 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..8306744 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,7 @@ + \ 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 9ee4154..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{ diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index 4f7e959..73c355f 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -12,7 +12,7 @@ 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{ diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java index 28077b9..941f81c 100644 --- a/src/core/process/C_MentorFillReview.java +++ b/src/core/process/C_MentorFillReview.java @@ -12,10 +12,9 @@ public class C_MentorFillReview extends TempProcess { public String graduationDesignId; public Map vMap; - + private static String buttonName ="指导老师评阅"; static String table="graduation_design_finished_product_mentor_score"; - public void teacherTeamFillOpeningReportOpinion() throws Exception{ if(!check()) throw new GExcptInit("MentorFillReview Attrs init error!"); FillInformation fillInformation=new FillInformation(); diff --git a/src/core/process/C_ReviewerFillReview.java b/src/core/process/C_ReviewerFillReview.java index d81556e..3d6bc14 100644 --- a/src/core/process/C_ReviewerFillReview.java +++ b/src/core/process/C_ReviewerFillReview.java @@ -11,7 +11,7 @@ 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{ diff --git a/src/core/process/C_SchoolFillScoreOpinion.java b/src/core/process/C_SchoolFillScoreOpinion.java index 48d3112..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!"); diff --git a/src/core/process/C_SecretaryFillOpeningReportOpinion.java b/src/core/process/C_SecretaryFillOpeningReportOpinion.java index 7bad03a..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{ diff --git a/src/core/process/C_SecretaryFillReplyRecord.java b/src/core/process/C_SecretaryFillReplyRecord.java index 86eacbd..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{ diff --git a/src/core/process/C_StudentFillGraduationDesignInformation.java b/src/core/process/C_StudentFillGraduationDesignInformation.java index 49fe875..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{ 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 c0df89b..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{ diff --git a/src/core/process/C_TeacherTeamFillScoreOpinion.java b/src/core/process/C_TeacherTeamFillScoreOpinion.java index 6e641da..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; 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/gdms/test.java b/src/gdms/test.java index ffdddc1..55dbfa0 100644 --- a/src/gdms/test.java +++ b/src/gdms/test.java @@ -17,18 +17,6 @@ public class test { System.out.println(i); }while(i<3); - List list = new ArrayList<>(); - list.add("q"); - list.add("w"); - Map map=new HashMap<>(); - map.put("a","b"); - map.put("c","d"); - Select sql = new Select(list,"zx",map,1,2); - System.out.println(sql.getSQL()); - System.out.println(Utils.getFilePathName("a","b")); - String a = "a"; - changeB(a); - System.out.println(a); } static void changeB(String a){ a="B"; 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 266671c..b7271e4 100644 --- a/src/servlet/S_StudentUploadFinishedProduct.java +++ b/src/servlet/S_StudentUploadFinishedProduct.java @@ -13,7 +13,17 @@ import java.io.IOException; 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 = request.getParameter("id"); - String fileURL = servlet.Utils.saveFile(request, fileType); + String id = "000"; + //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 687b7e9..0a7f8fb 100644 --- a/src/servlet/Utils.java +++ b/src/servlet/Utils.java @@ -1,7 +1,6 @@ package servlet; import gdms.Configuration; -import org.apache.coyote.Request; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -40,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); @@ -55,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/home.css b/web/cssFile/home.css index f0985a6..51e2e03 100644 --- a/web/cssFile/home.css +++ b/web/cssFile/home.css @@ -6,13 +6,14 @@ body{ height: 100%; } .fill-top-blank{ + border: 1px solid rgb(238, 238, 238); border-radius: 5px; height: 70px; width: 960px; position: absolute; top: 20px; right: 10px; - background-color: #323232; + background: url("images/topImg.jpg"); } .main2{ background-color:#fafafa; @@ -37,7 +38,7 @@ ul{ position: fixed; background-color: #c13139; z-index: 100; - box-shadow: 5px 0px 10px rgba(0, 0, 0, 0.3); + box-shadow: rgba(0, 0, 0, 0.23) 0 1px 2px; } .top-center-bar{ position: relative; @@ -424,9 +425,9 @@ ul{ width: 400px; height: 40px; margin: 15px 10px; - background-color: #e4e4e4; + background-color: rgba(0, 0, 0, 0.6); border-radius: 5px; - color: rgba(27, 27, 27, 0.87); + color: rgb(255, 255, 255); padding-left: 10px; line-height: 35px; font-size: 18px; diff --git a/web/cssFile/images/opt.sai2 b/web/cssFile/images/opt.sai2 index 9a62cbd..e69de29 100644 Binary files a/web/cssFile/images/opt.sai2 and b/web/cssFile/images/opt.sai2 differ diff --git a/web/cssFile/images/search1.sai2 b/web/cssFile/images/search1.sai2 index 648da7a..e69de29 100644 Binary files a/web/cssFile/images/search1.sai2 and b/web/cssFile/images/search1.sai2 differ diff --git a/web/cssFile/images/search2.sai2 b/web/cssFile/images/search2.sai2 index 6ba357a..e69de29 100644 Binary files a/web/cssFile/images/search2.sai2 and b/web/cssFile/images/search2.sai2 differ diff --git a/web/cssFile/images/topImg.jpg b/web/cssFile/images/topImg.jpg new file mode 100644 index 0000000..8bba19e Binary files /dev/null and b/web/cssFile/images/topImg.jpg differ diff --git a/web/cssFile/select-style.css b/web/cssFile/select-style.css index ac9a999..6a6da37 100644 --- a/web/cssFile/select-style.css +++ b/web/cssFile/select-style.css @@ -14,7 +14,7 @@ a{ height: 50px; top:10px; right: 20px; - background-color: rgba(255, 255, 255, 0.23); + background-color: rgba(0, 0, 0, 0.3); border-radius: 5px; } .search-button{ @@ -38,7 +38,7 @@ a{ float: left; width: 280px; height: 40px; - background: rgba(255, 255, 255, 0.85); + background: rgba(255, 255, 255, 0.91); } .search-input:hover{ background: rgb(255, 255, 255); diff --git a/web/download.jsp b/web/home/download.jsp similarity index 85% rename from web/download.jsp rename to web/home/download.jsp index bc2d5c9..37a54c4 100644 --- a/web/download.jsp +++ b/web/home/download.jsp @@ -9,8 +9,8 @@ 资料下载 - - + +
diff --git a/web/fillSbjMsg.jsp b/web/home/fillSbjMsg.jsp similarity index 89% rename from web/fillSbjMsg.jsp rename to web/home/fillSbjMsg.jsp index 422ac55..abf830c 100644 --- a/web/fillSbjMsg.jsp +++ b/web/home/fillSbjMsg.jsp @@ -1,4 +1,5 @@ -<%-- +<%@ page import="java.util.List" %> +<%@ page import="java.util.ArrayList" %><%-- Created by IntelliJ IDEA. User: lenovo Date: 2019/1/14 @@ -9,11 +10,11 @@ 填写选题信息 - - - + + + - +
填写选题信息
@@ -58,7 +59,6 @@
-
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 65% rename from web/home.jsp rename to web/home/home.jsp index 56d3d00..11b685a 100644 --- a/web/home.jsp +++ b/web/home/home.jsp @@ -1,4 +1,8 @@ -<%-- +<%@ page import="java.util.List" %> +<%@ 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 @@ -10,24 +14,32 @@ 毕业设计管理系统 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + -<%String type="teacher";pageContext.setAttribute("userType",type);%> +<% + 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; +%>
@@ -38,11 +50,11 @@
@@ -53,34 +65,33 @@