From 4144ed000d0105e59eed2ebd49daecc736997c88 Mon Sep 17 00:00:00 2001 From: zhai_lw Date: Wed, 16 Jan 2019 22:35:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/wlf' # Conflicts: # .idea/misc.xml # src/core/process/C_MentorFillReview.java # src/core/process/C_ReviewerFillReview.java --- .idea/artifacts/gdms_war_exploded.xml | 4 + .idea/dataSources.xml | 19 + .../6d4033d6-2147-4c12-a111-2ab915e871da.xml | 2274 +++++++++++++++++ .../storage_v2/_src_/schema/gdms.Q1cwAA.meta | 1 + .../storage_v2/_src_/schema/gdms.Q1cwAA.zip | Bin 0 -> 3096 bytes GDMS.iml | 10 - src/core/operation/UploadFile.java | 3 +- src/core/operation/utils/Utils.java | 2 +- .../C_CollegeFillOpeningReportOpinion.java | 1 + .../process/C_CollegeFillScoreOpinion.java | 1 + src/core/process/C_FillInformation.java | 13 + .../C_MentorFillOpeningReportOpinion.java | 1 + src/core/process/C_MentorFillReview.java | 1 + src/core/process/C_ReviewerFillReview.java | 1 + .../process/C_SchoolFillScoreOpinion.java | 1 + .../C_SecretaryFillOpeningReportRecord.java | 1 + .../process/C_SecretaryFillReplyRecord.java | 1 + src/core/process/C_Select.java | 3 + ...tudentFillGraduationDesignInformation.java | 1 + src/core/process/C_StudentSearchTeacher.java | 93 - src/core/process/C_StudentSelectTeacher.java | 18 +- .../C_StudentUploadFinishedProduct.java | 2 +- .../process/C_StudentUploadOpeningReport.java | 2 +- src/core/process/C_TeacherSearchStudent.java | 92 - src/core/process/C_TeacherSelectStudent.java | 13 +- ...C_TeacherTeamFillOpeningReportOpinion.java | 1 + .../C_TeacherTeamFillScoreOpinion.java | 1 + src/core/process/Utils.java | 9 +- src/dao/DBManagement.java | 5 + src/dao/SelectAll.java | 45 + .../S_CollegeFillOpeningReportOpinion.java | 1 + src/servlet/S_CollegeFillScoreOpinion.java | 1 + .../S_MentorFillOpeningReportOpinion.java | 1 + 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 | 1 + ...tudentFillGraduationDesignInformation.java | 2 +- src/servlet/S_StudentSelectTeacher.java | 2 +- .../S_StudentUploadFinishedProduct.java | 1 + src/servlet/S_StudentUploadOpeningReport.java | 1 + src/servlet/S_TeacherSelectStudent.java | 2 +- ...S_TeacherTeamFillOpeningReportOpinion.java | 1 + .../S_TeacherTeamFillScoreOpinion.java | 1 + web/home/fillSbjMsg.jsp | 27 +- web/home/fill_Information.jsp | 60 +- web/home/home.jsp | 20 +- web/home/result_list.jsp | 35 +- web/home/select.jsp | 37 +- web/home/upload_file.jsp | 12 +- web/jsFile/fill-action.js | 4 +- web/jsFile/home-update.js | 4 +- web/jsFile/search.js | 19 +- web/jsFile/sub-msg-input.js | 11 +- web/jsFile/test.js | 5 +- web/jsFile/upload_action.js | 6 +- web/test.jsp | 7 +- web/testfrom.jsp | 10 +- web/web/WEB-INF/web.xml | 6 - 60 files changed, 2554 insertions(+), 350 deletions(-) create mode 100644 .idea/dataSources.xml create mode 100644 .idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da.xml create mode 100644 .idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da/storage_v2/_src_/schema/gdms.Q1cwAA.meta create mode 100644 .idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da/storage_v2/_src_/schema/gdms.Q1cwAA.zip delete mode 100644 src/core/process/C_StudentSearchTeacher.java delete mode 100644 src/core/process/C_TeacherSearchStudent.java create mode 100644 src/dao/SelectAll.java delete mode 100644 web/web/WEB-INF/web.xml diff --git a/.idea/artifacts/gdms_war_exploded.xml b/.idea/artifacts/gdms_war_exploded.xml index 6d1dc1a..af883e5 100644 --- a/.idea/artifacts/gdms_war_exploded.xml +++ b/.idea/artifacts/gdms_war_exploded.xml @@ -7,6 +7,10 @@ + + + + diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..3099953 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,19 @@ + + + + + mariadb + true + org.mariadb.jdbc.Driver + jdbc:mariadb://localhost:3306/gdms + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da.xml b/.idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da.xml new file mode 100644 index 0000000..ecdf1da --- /dev/null +++ b/.idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da.xml @@ -0,0 +1,2274 @@ + + + + + 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 + + + 管理员 +
+ + 公告 +
+ + 毕业设计 +
+ + 毕设论文 +
+ + 指导老师评定成绩 +
+ + 评阅老师对论文的评审成绩 +
+ + 毕业设计信息 +
+ + 开题报告 +
+ + 开题报告会纪要 +
+ + 答辩 +
+ + 答辩记录表 +
+ + 开题报告秘书组 +
+ + 开题报告老师组 +
+ + 专业信息 +
+ + 答辩秘书小组 +
+ + 答辩教师组 +
+ + 学生用户 +
+ + 老师用户 +
+ + 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 + tinyint(3) unsigned|0s + 0 + normal + + + 5 + tinyint(3) unsigned|0s + 0 + 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/.idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da/storage_v2/_src_/schema/gdms.Q1cwAA.meta b/.idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da/storage_v2/_src_/schema/gdms.Q1cwAA.meta new file mode 100644 index 0000000..e69f059 --- /dev/null +++ b/.idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da/storage_v2/_src_/schema/gdms.Q1cwAA.meta @@ -0,0 +1 @@ +#n:gdms \ No newline at end of file diff --git a/.idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da/storage_v2/_src_/schema/gdms.Q1cwAA.zip b/.idea/dataSources/6d4033d6-2147-4c12-a111-2ab915e871da/storage_v2/_src_/schema/gdms.Q1cwAA.zip new file mode 100644 index 0000000000000000000000000000000000000000..8a94e8e7418191755535f55d75ab0f18a9291d8d GIT binary patch literal 3096 zcmbW3%Z}496ox~m!y+pLELj*Kc4;Q9+J-U=5)vS!L8!n2X{u2YH6{e*Qj(O>NNm}# zi>iIdDCv-HWkXW{0x9^%Zo7d`B>M!owebRVNt zv<(6cjZAYgADatfuA$XzrlGO1FyV7-80RozY3Qkjj^WaP_qn>PIRElB{`+#MD5THj zoTs0Hb%LD?BeEaVX$QzjRfJL;;B|&<&ka*sx7$|26yLRx*q*#aWK09GqA{^rs#6Re zGbg#UGVFw)6kx~2iIrws7e|>zgo)VIVF~R*bWBxqUqo9RmRFtZR;9!3s<8X@2iSKt z3v4t`uaF1fMsMw6t(XNwb1dGFRTZ;PQKdJa9Ns5!*uAoN{d|o5s9e`vMBNs#6vB6C z!;%X~KQ1G5sCizxMR5`(S_CJh1No|_5>Djyam2RN+Yehvb5Z^V*(g-sv0CHPi+|s} zGvE^GdIO(;sKI3pR3~^I7!5$>Q>z>WU``h^^T8Alx|#w^7x~AcouW5?WVe1EC<^JL zUM^eV$=!BjCSA}Am3atWX4R)7MaVspA^{6tcK~Cvm`DOaY#$GEF;;Tbt+LUc7~CmY zX!WLFlbE{YLT!Pfx}I$gdjU^Xdtx! - - - - - - - - - - diff --git a/src/core/operation/UploadFile.java b/src/core/operation/UploadFile.java index 75c76cb..07b5976 100644 --- a/src/core/operation/UploadFile.java +++ b/src/core/operation/UploadFile.java @@ -24,7 +24,8 @@ public class UploadFile extends Operation { ls.add(field); List resultLs = DBManagement.select(ls,table,limits,0,1); String lastFilePath = resultLs.get(0)[0]; - new File(lastFilePath).delete(); + if(lastFilePath!=null) + new File(lastFilePath).delete(); DBManagement.update(table,vMap,limits); return this.getOptions(); } diff --git a/src/core/operation/utils/Utils.java b/src/core/operation/utils/Utils.java index 6b09955..7c8952c 100644 --- a/src/core/operation/utils/Utils.java +++ b/src/core/operation/utils/Utils.java @@ -14,7 +14,7 @@ public interface Utils { { put("announcement","annex_url"); put("graduation_design_finished_product","graduation_design_url"); - put("graduation_design_opening_report","report_url"); + put("graduation_design_opening_report","url"); }}; static String stringOptionsFormat(String options){ return options.replaceAll(" {2,}", " ") ; diff --git a/src/core/process/C_CollegeFillOpeningReportOpinion.java b/src/core/process/C_CollegeFillOpeningReportOpinion.java index de81abf..054ed75 100644 --- a/src/core/process/C_CollegeFillOpeningReportOpinion.java +++ b/src/core/process/C_CollegeFillOpeningReportOpinion.java @@ -31,6 +31,7 @@ public class C_CollegeFillOpeningReportOpinion extends C_FillInformation{ Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); } diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java index 8dba3ab..8e98686 100644 --- a/src/core/process/C_CollegeFillScoreOpinion.java +++ b/src/core/process/C_CollegeFillScoreOpinion.java @@ -31,6 +31,7 @@ public class C_CollegeFillScoreOpinion extends C_FillInformation{ Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); diff --git a/src/core/process/C_FillInformation.java b/src/core/process/C_FillInformation.java index edc4a8b..e814a07 100644 --- a/src/core/process/C_FillInformation.java +++ b/src/core/process/C_FillInformation.java @@ -1,10 +1,23 @@ package core.process; +import dao.DBManagement; + +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public abstract class C_FillInformation extends TempProcess { public String getJspURL(){ return "/home/fill_Information.jsp"; } public abstract List getInputName(); + public List search() throws Exception { + List columns = new ArrayList<>(); + columns.add("*"); + Map limits = new HashMap<>(); + limits.put("id",getGraduationDesignId()); + List ls = DBManagement.select(columns,"graduation_design_information",limits,0,10); + return ls; + } } diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index 054cc43..b93d222 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -33,6 +33,7 @@ public class C_MentorFillOpeningReportOpinion extends C_FillInformation{ Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java index 7a942e4..4c8eeee 100644 --- a/src/core/process/C_MentorFillReview.java +++ b/src/core/process/C_MentorFillReview.java @@ -33,6 +33,7 @@ public class C_MentorFillReview extends C_FillInformation { Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); } diff --git a/src/core/process/C_ReviewerFillReview.java b/src/core/process/C_ReviewerFillReview.java index 27ee1bb..6c97a3b 100644 --- a/src/core/process/C_ReviewerFillReview.java +++ b/src/core/process/C_ReviewerFillReview.java @@ -28,6 +28,7 @@ public class C_ReviewerFillReview extends C_FillInformation { Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); } diff --git a/src/core/process/C_SchoolFillScoreOpinion.java b/src/core/process/C_SchoolFillScoreOpinion.java index 8538384..22c6036 100644 --- a/src/core/process/C_SchoolFillScoreOpinion.java +++ b/src/core/process/C_SchoolFillScoreOpinion.java @@ -29,6 +29,7 @@ public class C_SchoolFillScoreOpinion extends C_FillInformation { Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); } diff --git a/src/core/process/C_SecretaryFillOpeningReportRecord.java b/src/core/process/C_SecretaryFillOpeningReportRecord.java index e6a5b36..cf26798 100644 --- a/src/core/process/C_SecretaryFillOpeningReportRecord.java +++ b/src/core/process/C_SecretaryFillOpeningReportRecord.java @@ -29,6 +29,7 @@ public class C_SecretaryFillOpeningReportRecord extends C_FillInformation{ Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); } diff --git a/src/core/process/C_SecretaryFillReplyRecord.java b/src/core/process/C_SecretaryFillReplyRecord.java index c96f875..56eaf04 100644 --- a/src/core/process/C_SecretaryFillReplyRecord.java +++ b/src/core/process/C_SecretaryFillReplyRecord.java @@ -29,6 +29,7 @@ public class C_SecretaryFillReplyRecord extends C_FillInformation{ Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); diff --git a/src/core/process/C_Select.java b/src/core/process/C_Select.java index c499aaa..327b106 100644 --- a/src/core/process/C_Select.java +++ b/src/core/process/C_Select.java @@ -1,7 +1,10 @@ package core.process; +import java.util.List; + public abstract class C_Select extends TempProcess { public String getJspURL(){ return "/home/select.jsp"; } + public abstract List search(String id)throws Exception; } diff --git a/src/core/process/C_StudentFillGraduationDesignInformation.java b/src/core/process/C_StudentFillGraduationDesignInformation.java index b7aa3e2..5928244 100644 --- a/src/core/process/C_StudentFillGraduationDesignInformation.java +++ b/src/core/process/C_StudentFillGraduationDesignInformation.java @@ -26,6 +26,7 @@ public class C_StudentFillGraduationDesignInformation extends C_FillSbjMsg { Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); } diff --git a/src/core/process/C_StudentSearchTeacher.java b/src/core/process/C_StudentSearchTeacher.java deleted file mode 100644 index d2b4109..0000000 --- a/src/core/process/C_StudentSearchTeacher.java +++ /dev/null @@ -1,93 +0,0 @@ -package core.process; - -import core.operation.Search; -import error.GExcptInit; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class C_StudentSearchTeacher{ - String teacherID; - - protected static String buttonName = ""; - protected static String iconURL=""; - protected static String targetURL=""; - protected static String info = ""; - static String table = "teacher"; - - Map TeacherInfo=new HashMap(); - public Map 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",1); - Map options = search.execute(null); - List result = (List) options.get("result"); - String[] s = result.get(0); - TeacherInfo.put("id",s[0]); - TeacherInfo.put("name",s[2]); - TeacherInfo.put("e_mail_location",s[3]); - 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) - return false; - return true; - } - public String getTeacherID(){ - return teacherID; - } - public void setTeacherID(String teacherID){ - this.teacherID=teacherID; - } - - public String getInfo() { - return info; - } - - - public String getTargetURL() { - return targetURL; - } - - - public String getIconURL() { - return iconURL; - } - - - public String getButtonName() { - return buttonName; - } -} diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index a0dd39a..91ec55e 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -2,6 +2,7 @@ package core.process; import core.operation.Search; import core.operation.Select; +import dao.DBManagement; import error.GExcptInit; import error.GExcptSQL; @@ -31,13 +32,21 @@ public class C_StudentSelectTeacher extends C_Select { Map options=select.execute(null); updateStatus(); } - public List> search(String teacherId) throws Exception{ + public List search(String teacherId) throws Exception{ + if(teacherId==null){ + System.out.println("ttt"); + } + if(teacherId.equals("*")){ + List result = DBManagement.selectAll("teacher",0,10); + core.process.Utils.formatResult(result); + return result; + } Search search = new Search() ; search.setOptions(new HashMap<>()); search.addOptions("table","teacher"); List fields = new ArrayList<>(); fields.add("*"); - search.addOptions("field",fields); + search.addOptions("fields",fields); Map limits = new HashMap<>(); limits.put("id",teacherId); search.addOptions("limits",limits); @@ -45,9 +54,8 @@ public class C_StudentSelectTeacher extends C_Select { 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; + core.process.Utils.formatResult(result); + return result; } protected boolean check() { if(this.getStudentId()==null||this.getTeacherId()==null) diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java index 5199be6..5ee2afa 100644 --- a/src/core/process/C_StudentUploadFinishedProduct.java +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -19,7 +19,7 @@ public class C_StudentUploadFinishedProduct extends C_UploadFile { private static String table="graduation_design_finished_product"; private static String field ="finished_product_status"; - static String file_type = "finished_product"; + static String file_type = "graduation_design_finished_product"; public void uploadFinishedProduct() throws Exception{ if(!check()) throw new GExcptInit("Upload FinishedProduct Attrs init error!"); UploadFile uploadFile=new UploadFile(); diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java index 395a956..96efdd8 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -12,7 +12,7 @@ public class C_StudentUploadOpeningReport extends C_UploadFile{ String openingReportURL; String graduationDesignId; private static String buttonName ="提交开题报告"; - private static String file_type = "opening_report"; + private static String file_type = "graduation_design_opening_report"; private static String targetURL="/home/student-upload-opening-report"; private static String iconURL="../cssFile/images/upload.png"; private static String info = ""; diff --git a/src/core/process/C_TeacherSearchStudent.java b/src/core/process/C_TeacherSearchStudent.java deleted file mode 100644 index 5a67461..0000000 --- a/src/core/process/C_TeacherSearchStudent.java +++ /dev/null @@ -1,92 +0,0 @@ -package core.process; - -import core.operation.Search; -import error.GExcptInit; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class C_TeacherSearchStudent { - String studentId; - - protected static String buttonName = ""; - protected static String iconURL=""; - protected static String targetURL=""; - protected static String info = ""; - static String table="student"; - - public Map search() throws Exception{ - if(!check()) throw new GExcptInit("studentId Attrs init error!"); - Map studentInfo =new HashMap<>(); - 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.getStudentId()); - search.addOptions("limits",limits); - search.addOptions("start",0); - search.addOptions("end",1); - Map options = search.execute(null); - List result = (List) options.get("result"); - String[] s = result.get(0); - studentInfo.put("id",s[0]); - studentInfo.put("name",s[2]); - studentInfo.put("e_mail_location",s[3]); - studentInfo.put("phone_number",s[4]); - return studentInfo; - } - public List> _search() throws Exception{ - if(!check()) throw new GExcptInit("studentId 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.getStudentId()); - 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) - return false; - return true; - } - public String getStudentId(){ - return studentId; - } - public void setStudentId(String studentId){ - this.studentId=studentId; - } - - public String getInfo() { - return info; - } - - - public String getTargetURL() { - return targetURL; - } - - - public String getIconURL() { - return iconURL; - } - - - public String getButtonName() { - return buttonName; - } -} diff --git a/src/core/process/C_TeacherSelectStudent.java b/src/core/process/C_TeacherSelectStudent.java index 75d07c8..488eb23 100644 --- a/src/core/process/C_TeacherSelectStudent.java +++ b/src/core/process/C_TeacherSelectStudent.java @@ -2,6 +2,7 @@ package core.process; import core.operation.Search; import core.operation.Select; +import dao.DBManagement; import error.GExcptInit; import error.GExcptSQL; @@ -30,7 +31,12 @@ public class C_TeacherSelectStudent extends C_Select { Map options=select.execute(null); updateStatus(); } - public List> search(String studentId) throws Exception{ + public List search(String studentId) throws Exception{ + if(studentId.equals("*")){ + List result = DBManagement.selectAll("student",0,10); + core.process.Utils.formatResult(result); + return result; + } Search search = new Search() ; search.setOptions(new HashMap<>()); search.addOptions("table","student"); @@ -44,9 +50,8 @@ public class C_TeacherSelectStudent extends C_Select { 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; + core.process.Utils.formatResult(result); + return result; } protected boolean check() { if(this.getStudentId()==null||this.getTeacherId()==null) diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java index 0de5e71..fb00505 100644 --- a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java +++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java @@ -29,6 +29,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends C_FillInformation{ Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); } diff --git a/src/core/process/C_TeacherTeamFillScoreOpinion.java b/src/core/process/C_TeacherTeamFillScoreOpinion.java index fbfdceb..fc9cfe6 100644 --- a/src/core/process/C_TeacherTeamFillScoreOpinion.java +++ b/src/core/process/C_TeacherTeamFillScoreOpinion.java @@ -31,6 +31,7 @@ public class C_TeacherTeamFillScoreOpinion extends C_FillInformation { Maplimits = new HashMap<>(); limits.put("id",this.getGraduationDesignId()); fillInformation.addOptions("limits",limits); + fillInformation.addOptions("vMap",vMap); fillInformation.execute(null); updateStatus(); } diff --git a/src/core/process/Utils.java b/src/core/process/Utils.java index 6cd376f..a683ac4 100644 --- a/src/core/process/Utils.java +++ b/src/core/process/Utils.java @@ -8,14 +8,9 @@ import java.util.List; import java.util.Map; public interface Utils { - static void formatResult(List result, List> studentsInfo) { + static void formatResult(List result) { 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); + s[1] = null; } } diff --git a/src/dao/DBManagement.java b/src/dao/DBManagement.java index 35cf468..cae6e43 100644 --- a/src/dao/DBManagement.java +++ b/src/dao/DBManagement.java @@ -166,6 +166,11 @@ public class DBManagement { String sql = select.getSQL(); return query(sql); } + public static List selectAll(String table, int startRow, int endRow) throws Exception { + SelectAll selectAll = new SelectAll(table,startRow,endRow); + String sql = selectAll.getSQL(); + return query(sql); + } public static void update(String table, Map vMap, Map limits) throws GExcptSQL { Update update = new Update(table,vMap,limits); String sql = update.getSQL(); diff --git a/src/dao/SelectAll.java b/src/dao/SelectAll.java new file mode 100644 index 0000000..432b97d --- /dev/null +++ b/src/dao/SelectAll.java @@ -0,0 +1,45 @@ +package dao; + +public class SelectAll extends SQLStmt { + static String fs = "SELECT"; + private int startRow; + private int endRow; + SelectAll(String table,int startRow, int endRow) { + super(table); + this.setStartRow(startRow); + this.setEndRow(endRow); + } + + @Override + public String getSQL() { + return getFs()+getTs()+getLs(); + } + + + @Override + public String getFs() { + return fs+" * "; + } + private String getTs(){ + return "FROM "+this.getTable()+" "; + } + private String getLs(){ + String sql="LIMIT "+this.getStartRow()+", "+this.getEndRow(); + return sql; + } + public int getStartRow() { + return startRow; + } + + public void setStartRow(int startRow) { + this.startRow = startRow; + } + + public int getEndRow() { + return endRow; + } + + public void setEndRow(int endRow) { + this.endRow = endRow; + } +} diff --git a/src/servlet/S_CollegeFillOpeningReportOpinion.java b/src/servlet/S_CollegeFillOpeningReportOpinion.java index 5b48cb3..0f042ab 100644 --- a/src/servlet/S_CollegeFillOpeningReportOpinion.java +++ b/src/servlet/S_CollegeFillOpeningReportOpinion.java @@ -25,6 +25,7 @@ public class S_CollegeFillOpeningReportOpinion extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } + response.getWriter().write("提交成功"); } static String[] vName = { "college_opinion" diff --git a/src/servlet/S_CollegeFillScoreOpinion.java b/src/servlet/S_CollegeFillScoreOpinion.java index 44e29e1..0e6a4ef 100644 --- a/src/servlet/S_CollegeFillScoreOpinion.java +++ b/src/servlet/S_CollegeFillScoreOpinion.java @@ -24,6 +24,7 @@ public class S_CollegeFillScoreOpinion extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } + response.getWriter().write("提交成功"); } static String[] vName = { "college_opinion", diff --git a/src/servlet/S_MentorFillOpeningReportOpinion.java b/src/servlet/S_MentorFillOpeningReportOpinion.java index 6617ae6..ca769a0 100644 --- a/src/servlet/S_MentorFillOpeningReportOpinion.java +++ b/src/servlet/S_MentorFillOpeningReportOpinion.java @@ -24,6 +24,7 @@ public class S_MentorFillOpeningReportOpinion extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } + response.getWriter().write("提交成功"); } static String[] vName = { "mentor_opinion" diff --git a/src/servlet/S_MentorFillReview.java b/src/servlet/S_MentorFillReview.java index 87ce1be..1a304ae 100644 --- a/src/servlet/S_MentorFillReview.java +++ b/src/servlet/S_MentorFillReview.java @@ -25,7 +25,7 @@ public class S_MentorFillReview extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } - + response.getWriter().write("提交成功"); } static String[] vName = { "total_grade", diff --git a/src/servlet/S_ReviewerFillReview.java b/src/servlet/S_ReviewerFillReview.java index a51e431..31f176b 100644 --- a/src/servlet/S_ReviewerFillReview.java +++ b/src/servlet/S_ReviewerFillReview.java @@ -25,7 +25,7 @@ public class S_ReviewerFillReview extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } - + response.getWriter().write("提交成功"); } static String[] vName = { "score", diff --git a/src/servlet/S_SchoolFillScoreOpinion.java b/src/servlet/S_SchoolFillScoreOpinion.java index d16a1ff..0460374 100644 --- a/src/servlet/S_SchoolFillScoreOpinion.java +++ b/src/servlet/S_SchoolFillScoreOpinion.java @@ -25,7 +25,7 @@ public class S_SchoolFillScoreOpinion extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } - + response.getWriter().write("提交成功"); } static String[] vName = { "school_opinion", diff --git a/src/servlet/S_SecretaryFillOpeningReportRecord.java b/src/servlet/S_SecretaryFillOpeningReportRecord.java index 45d7fa5..c84a732 100644 --- a/src/servlet/S_SecretaryFillOpeningReportRecord.java +++ b/src/servlet/S_SecretaryFillOpeningReportRecord.java @@ -25,7 +25,7 @@ public class S_SecretaryFillOpeningReportRecord extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } - + response.getWriter().write("提交成功"); } static String[] vName = { "secretary_record" diff --git a/src/servlet/S_SecretaryFillReplyRecord.java b/src/servlet/S_SecretaryFillReplyRecord.java index bcd2ec5..6139cef 100644 --- a/src/servlet/S_SecretaryFillReplyRecord.java +++ b/src/servlet/S_SecretaryFillReplyRecord.java @@ -25,6 +25,7 @@ public class S_SecretaryFillReplyRecord extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } + response.getWriter().write("提交成功"); } static String[] vName = { "secretary_record" diff --git a/src/servlet/S_StudentFillGraduationDesignInformation.java b/src/servlet/S_StudentFillGraduationDesignInformation.java index b6f7ac5..b30b61a 100644 --- a/src/servlet/S_StudentFillGraduationDesignInformation.java +++ b/src/servlet/S_StudentFillGraduationDesignInformation.java @@ -26,7 +26,7 @@ public class S_StudentFillGraduationDesignInformation extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } - + response.getWriter().write("提交成功"); } static String[] vName = { "chinese_name", diff --git a/src/servlet/S_StudentSelectTeacher.java b/src/servlet/S_StudentSelectTeacher.java index 618e323..f844ebc 100644 --- a/src/servlet/S_StudentSelectTeacher.java +++ b/src/servlet/S_StudentSelectTeacher.java @@ -11,7 +11,6 @@ import java.io.IOException; @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); String teacherId=request.getParameter("id"); User user=(User)request.getSession().getAttribute("user"); String studentId=user.getId(); @@ -24,6 +23,7 @@ public class S_StudentSelectTeacher extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } + response.getWriter().write("选择成功"); } } diff --git a/src/servlet/S_StudentUploadFinishedProduct.java b/src/servlet/S_StudentUploadFinishedProduct.java index 32f0353..437c5ce 100644 --- a/src/servlet/S_StudentUploadFinishedProduct.java +++ b/src/servlet/S_StudentUploadFinishedProduct.java @@ -33,5 +33,6 @@ public class S_StudentUploadFinishedProduct extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } + response.getWriter().write("提交成功"); } } diff --git a/src/servlet/S_StudentUploadOpeningReport.java b/src/servlet/S_StudentUploadOpeningReport.java index 1d40bac..61f8307 100644 --- a/src/servlet/S_StudentUploadOpeningReport.java +++ b/src/servlet/S_StudentUploadOpeningReport.java @@ -33,5 +33,6 @@ public class S_StudentUploadOpeningReport extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } + response.getWriter().write("提交成功"); } } diff --git a/src/servlet/S_TeacherSelectStudent.java b/src/servlet/S_TeacherSelectStudent.java index d177fc0..db88e4b 100644 --- a/src/servlet/S_TeacherSelectStudent.java +++ b/src/servlet/S_TeacherSelectStudent.java @@ -12,7 +12,6 @@ import java.io.IOException; @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); String studentId=request.getParameter("id"); User user=(User)request.getSession().getAttribute("user"); String teacherId=user.getId(); @@ -25,5 +24,6 @@ public class S_TeacherSelectStudent extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } + response.getWriter().write("选择成功"); } } diff --git a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java index 28a27b1..f91e2e0 100644 --- a/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java +++ b/src/servlet/S_TeacherTeamFillOpeningReportOpinion.java @@ -25,6 +25,7 @@ public class S_TeacherTeamFillOpeningReportOpinion extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } + response.getWriter().write("提交成功"); } static String[] vName = { "report_teacher_team_opinion" diff --git a/src/servlet/S_TeacherTeamFillScoreOpinion.java b/src/servlet/S_TeacherTeamFillScoreOpinion.java index fbb5d4f..906bd92 100644 --- a/src/servlet/S_TeacherTeamFillScoreOpinion.java +++ b/src/servlet/S_TeacherTeamFillScoreOpinion.java @@ -25,6 +25,7 @@ public class S_TeacherTeamFillScoreOpinion extends HttpServlet { e.printStackTrace(); response.sendRedirect("/op_fail.jsp"); } + response.getWriter().write("提交成功"); } static String[] vName = { "teacher_team_opinion", diff --git a/web/home/fillSbjMsg.jsp b/web/home/fillSbjMsg.jsp index f5db530..059b4a7 100644 --- a/web/home/fillSbjMsg.jsp +++ b/web/home/fillSbjMsg.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.Process" %> +<%@ page import="core.process.TempProcess" %><%-- Created by IntelliJ IDEA. User: lenovo Date: 2019/1/14 @@ -16,26 +19,31 @@
+ <% + int processIndex=Integer.parseInt(request.getParameter("processIndex")); + User user=(User)session.getAttribute("user"); + TempProcess process= (TempProcess) user.getCondition().get(processIndex); + %>
填写选题信息
-
+
论文题目:
- -
题目类别:
-
题目来源:
- @@ -44,7 +52,7 @@
题目性质:
- @@ -54,9 +62,12 @@
题目描述:
- +
+ +
diff --git a/web/home/fill_Information.jsp b/web/home/fill_Information.jsp index 5008c48..30b13f9 100644 --- a/web/home/fill_Information.jsp +++ b/web/home/fill_Information.jsp @@ -2,7 +2,9 @@ <%@ page import="java.util.Map" %> <%@ page import="java.util.HashMap" %> <%@ page import="java.util.List" %> -<%@ page import="java.util.ArrayList" %><%-- +<%@ page import="java.util.ArrayList" %> +<%@ page import="core.process.TempProcess" %> +<%@ page import="core.process.C_FillInformation" %><%-- Created by IntelliJ IDEA. User: lenovo Date: 2019/1/12 @@ -20,42 +22,44 @@ <% - Map map2=new HashMap(); - Map map3=new HashMap(); - map2.put("姓名","李先生"); - map2.put("学号","201630126050"); - map2.put("电话","18711191679"); - map3.put("姓名","王先生"); - map3.put("学号","201630126051"); - map3.put("电话","18711191679"); - List> list=new ArrayList>(); - pageContext.setAttribute("map",map2); User user=(User)session.getAttribute("user"); + C_FillInformation p = (C_FillInformation)(user.getCondition().get(Integer.parseInt(request.getParameter("processIndex")))); + List ls = p.search(); + pageContext.setAttribute("ls",ls); String type=user.getType(); pageContext.setAttribute("type",type); %>
填写意见
-
-
${map.姓名}
- -
-
- -
- -
${z.key}:${z.value}
- -
-
- + +
+
${s[1]}
- +
+
- - -
+
+
${'论文题目'}:${s[1]}
+
${'英文题目'}:${s[2]}
+
${'论文类型'}:${s[3]}
+
${'选题来源'}:${s[4]}
+
${'选题性质'}:${s[5]}
+
+
+ + + <% + if(p.getInputName().get(1)!=null) + { + out.print(""); + } + %> + + +
+
+
diff --git a/web/home/home.jsp b/web/home/home.jsp index bd69845..02360ea 100644 --- a/web/home/home.jsp +++ b/web/home/home.jsp @@ -15,6 +15,7 @@ 毕业设计管理系统 + @@ -30,6 +31,7 @@ + <% @@ -75,25 +77,9 @@
个人信息
-
- -
- -
-
资料下载
- -
-
- -
- -
-
资料下载
- -
- +
>
diff --git a/web/home/result_list.jsp b/web/home/result_list.jsp index ce9e2a3..93d787c 100644 --- a/web/home/result_list.jsp +++ b/web/home/result_list.jsp @@ -1,4 +1,6 @@ -<%-- +<%@ page import="java.util.List" %> +<%@ page import="core.process.C_Select" %> +<%@ page import="core.user.User" %><%-- Created by IntelliJ IDEA. User: lenovo Date: 2019/1/11 @@ -6,20 +8,25 @@ To change this template use File | Settings | File Templates. --%> <%@ page contentType="text/html;charset=UTF-8" language="java" isELIgnored="false" pageEncoding="UTF-8" %> - +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <% String id=request.getParameter("id"); - String searchType=request.getParameter("searchType"); + int processIndex = (int) session.getAttribute("searchProcessIndex"); + User user=(User)session.getAttribute("user"); + C_Select process= (C_Select) user.getCondition().get(processIndex); + List lm = process.search(id); + pageContext.setAttribute("list",lm); + String type=user.getType(); %> -<%%> -
-
<%=searchType%>
-
- <%for(int k=0;k<2;k++) - for (int n=0;n<2;n++) - out.print("
电话号码："+k+n+"
"); - %> -
电话号码：18711191679
+ +
+
${z[2]}
+
+
${'账号'}：${z[0]}
+
${'电话号码'}：${z[4]}
+
${'邮箱地址'}：${z[3]}
+
+
- -
+ diff --git a/web/home/select.jsp b/web/home/select.jsp index d84c095..ee2efa4 100644 --- a/web/home/select.jsp +++ b/web/home/select.jsp @@ -11,6 +11,8 @@ <%@ page import="java.util.HashMap" %> <%@ page import="java.util.List" %> <%@ page import="java.util.ArrayList" %> +<%@ page import="core.process.TempProcess" %> +<%@ page import="core.process.C_Select" %> <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> @@ -22,24 +24,17 @@ <% - Map map1=new HashMap(); - Map map2=new HashMap<>(); - map1.put("姓名","hehcu"); - map1.put("学号","201630126050"); - map1.put("电话","18711191679"); - map1.put("状态","选择"); - map2.put("姓名","laoshi"); - map2.put("学号","54646546"); - map2.put("电话","18711191679"); - map2.put("状态","已选"); - List> list=new ArrayList<>(); - list.add(map1); - list.add(map2); - pageContext.setAttribute("list",list); + String s = request.getParameter("processIndex"); + int processIndex=Integer.parseInt(s); User user=(User)session.getAttribute("user"); + session.setAttribute("searchProcessIndex",processIndex); + C_Select process= (C_Select) user.getCondition().get(processIndex); + List lm = process.search("*"); + pageContext.setAttribute("list",lm); String type=user.getType(); pageContext.setAttribute("type",type); %> +
@@ -52,7 +47,7 @@
- +
@@ -64,14 +59,14 @@
-
${z.姓名}
+
${z[2]}
- -
${msg.key}：${msg.value}
- +
${'账号'}：${z[0]}
+
${'电话号码'}：${z[4]}
+
${'邮箱地址'}：${z[3]}
- +
diff --git a/web/home/upload_file.jsp b/web/home/upload_file.jsp index c76a59b..88d822d 100644 --- a/web/home/upload_file.jsp +++ b/web/home/upload_file.jsp @@ -1,4 +1,5 @@ -<%-- +<%@ page import="core.user.User" %> +<%@ page import="core.process.TempProcess" %><%-- Created by IntelliJ IDEA. User: lenovo Date: 2019/1/13 @@ -15,6 +16,13 @@
+ <% + String s = request.getParameter("processIndex"); + int processIndex=Integer.parseInt(s); + User user=(User)session.getAttribute("user"); + String url = user.getCondition().get(processIndex).getTargetURL(); + String id = ((TempProcess)(user.getCondition().get(processIndex))).getGraduationDesignId(); + %>
上传定稿
上传定稿
@@ -25,6 +33,8 @@
+ +
选择文件
上传文件
diff --git a/web/jsFile/fill-action.js b/web/jsFile/fill-action.js index 6722ebc..1b2c9a6 100644 --- a/web/jsFile/fill-action.js +++ b/web/jsFile/fill-action.js @@ -2,9 +2,9 @@ $(document).off('click',submit_text).on('click','.submit-text',submit_text); }) function submit_text() { - var Url3=$(this).parent().attr("action"); + var Url3=$('.fill-form').attr("action"); alert(Url3); - var fillDate=$(this).parent().serialize(); + var fillDate=$('.fill-form').serialize(); var upddateit=$('.updated'); alert(fillDate); $.post(Url3,fillDate,function(data,status) { diff --git a/web/jsFile/home-update.js b/web/jsFile/home-update.js index bec3aa0..4b252ee 100644 --- a/web/jsFile/home-update.js +++ b/web/jsFile/home-update.js @@ -5,8 +5,8 @@ function upadateFrame(e) { e.preventDefault(); var updateUrl=$(this).attr('href'); var arr=updateUrl.split('?'); - var proccessIndex=arr[1]; - var indexData={"index":proccessIndex}; + var processIndex=arr[1]; + var indexData={"processIndex":processIndex}; $('.update-frame').load(updateUrl+' .updated',indexData,function (data) { }); history.pushState(null,null,updateUrl); diff --git a/web/jsFile/search.js b/web/jsFile/search.js index 8752e68..de98727 100644 --- a/web/jsFile/search.js +++ b/web/jsFile/search.js @@ -10,12 +10,11 @@ function searchStuMsg(e) { if($('.search-input').val()=='') { e.preventDefault(); - alert('请输入学号'); + alert('请输入学生账号'); } else { var id=$('.search-input').val(); - var searchType='teacher'; - var rqDate={"id":id,"searchType":searchType}; + var rqDate={"id":id}; var Url1='result_list.jsp'; $('.list-frame').load(Url1,rqDate); } @@ -24,12 +23,11 @@ function searchTeaMsg(e) { if($('.search-input').val()=='') { e.preventDefault(); - alert('请输入学号'); + alert('请输入老师账号'); } else { var id=$('.search-input').val(); - var searchType='student'; - var rqDate={"id":id,"searchType":searchType}; + var rqDate={"id":id}; var Url1='result_list.jsp'; $('.list-frame').load(Url1,rqDate); } @@ -37,20 +35,21 @@ function searchTeaMsg(e) { function KDsearchSmsg(e) { if(e.keyCode==13) { - searchStuMsg(e); + $('.search-button').click(); } } function KDsearchTmsg(e) { if(e.keyCode==13) { - searchTeaMsg(e); + $('.search-button').click(); } } function select_one(Url2,button) { var id=button.val(); var selectDate={"id":id}; if(button.html()!="已选") - {$.post(Url2,selectDate,function (data,status) { + { + $.post(Url2,selectDate,function (data,status) { if(status=='success') { button.addClass('on').html("已选"); @@ -59,7 +58,7 @@ function select_one(Url2,button) { } function studentSelect() { var button=$(this); - select_one("testfrom.jsp",button); + select_one("/home/student-select-teacher",button); } function teacherSelect() { var button=$(this); diff --git a/web/jsFile/sub-msg-input.js b/web/jsFile/sub-msg-input.js index a02f1ba..54b2a75 100644 --- a/web/jsFile/sub-msg-input.js +++ b/web/jsFile/sub-msg-input.js @@ -4,7 +4,7 @@ } ) function sendSub() { - var Url3='testfrom.jsp'; + var Url3='/home/student-fill-graduation-design-information'; if( $('.sub-input').eq(0).val()==''|| $('.sub-input').eq(1).val()=='' || $('.sub-input').eq(2).val()=='') { @@ -22,12 +22,9 @@ function sendSub() { alert("请将信息填写完整"); return; } - var fillDate=$(this).parent().serialize(); - $.post(Url3,fillDate,function(data,status) { - if(status=='success') - { - alert("提交成功"); - } + var fillData=$('.subform').serialize(); + $.post(Url3,fillData,function(data,status) { + alert(status); } ); } \ No newline at end of file diff --git a/web/jsFile/test.js b/web/jsFile/test.js index 47ea98f..e4f5718 100644 --- a/web/jsFile/test.js +++ b/web/jsFile/test.js @@ -1,6 +1,7 @@ -$(document).ready( +$(document).ready( function () { - alert("你好"); + sessionStorage.setItem("hello","hha"); + alert(sessionStorage.getItem("hello")); }) function alet() { alert("成功"); diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js index 5ede1d1..957aa8f 100644 --- a/web/jsFile/upload_action.js +++ b/web/jsFile/upload_action.js @@ -5,14 +5,16 @@ }) function sendFile() { var fileData =new FormData(); - var Url4='/student-upload-finished-product'; + var Url4=$('.upload-url').val(); + var id=$('.upload-id').val(); var file=$('#select')[0].files[0]; + if($('.true-select').val()=='') { alert("请选择文件"); return; } - alert(file); + fileData.append("id",id); fileData.append("file",file); $.ajax({ type:"post", diff --git a/web/test.jsp b/web/test.jsp index 0dd684f..a36aa94 100644 --- a/web/test.jsp +++ b/web/test.jsp @@ -13,7 +13,12 @@ +<% + String a=request.getParameter("chinese_name"); + response.getWriter().write(a); + System.out.println(a); +%> -
hhhhhhhhhhhhhh
+
diff --git a/web/testfrom.jsp b/web/testfrom.jsp index 940ad6c..cce145c 100644 --- a/web/testfrom.jsp +++ b/web/testfrom.jsp @@ -1,10 +1,4 @@ <%@ page import="java.util.List" %> -<%@page import="org.apache.commons.fileupload.FileItem" %> -<%@page import="org.apache.commons.fileupload.FileUploadBase"%> -<%@page import="org.apache.commons.fileupload.FileUploadException"%> -<%@page import="org.apache.commons.fileupload.ProgressListener"%> -<%@page import="org.apache.commons.fileupload.disk.DiskFileItemFactory"%> -<%@page import="org.apache.commons.fileupload.servlet.ServletFileUpload"%> <%@page import="java.io.File"%> <%@ page import="java.io.PrintWriter" %> <%-- @@ -16,5 +10,7 @@ --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <% + String name=request.getParameter("chinese_name"); + response.getWriter().write(name); %> -
hello
+
diff --git a/web/web/WEB-INF/web.xml b/web/web/WEB-INF/web.xml deleted file mode 100644 index d80081d..0000000 --- a/web/web/WEB-INF/web.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file