From adbb0795d8c90f1ec199ce3026c255eb40b8ad63 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Tue, 15 Jan 2019 16:32:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0iconurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...c8301.corrupted.20190114-065036.reason.txt | 22 + ...b3e917bc8301.corrupted.20190114-065036.xml | 2144 +++++++++++++++++ 2 files changed, 2166 insertions(+) create mode 100644 .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt create mode 100644 .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt new file mode 100644 index 0000000..cf4b29f --- /dev/null +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.reason.txt @@ -0,0 +1,22 @@ +com.intellij.database.serialization.ImportException: RDBMS is not specified int the model file + at com.intellij.database.serialization.ModelImporter.deserializeModel(ModelImporter.java:57) + at com.intellij.database.serialization.ModelSerializerKt.deserialize(ModelSerializer.kt:37) + at com.intellij.database.serialization.ModelSerializerKt.deserialize(ModelSerializer.kt:27) + at com.intellij.database.dataSource.DataSourceStorage.readModel(DataSourceStorage.java:683) + at com.intellij.database.dataSource.DataSourceStorage.readModel(DataSourceStorage.java:671) + at com.intellij.database.dataSource.DataSourceStorage.loadModels(DataSourceStorage.java:488) + at com.intellij.database.dataSource.DataSourceStorage.access$000(DataSourceStorage.java:90) + at com.intellij.database.dataSource.DataSourceStorage$2.run(DataSourceStorage.java:398) + at com.intellij.openapi.progress.impl.CoreProgressManager$TaskRunnable.run(CoreProgressManager.java:736) + at com.intellij.openapi.progress.impl.CoreProgressManager.lambda$runProcess$1(CoreProgressManager.java:157) + at com.intellij.openapi.progress.impl.CoreProgressManager.registerIndicatorAndRun(CoreProgressManager.java:580) + at com.intellij.openapi.progress.impl.CoreProgressManager.executeProcessUnderProgress(CoreProgressManager.java:525) + at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:85) + at com.intellij.openapi.progress.impl.CoreProgressManager.runProcess(CoreProgressManager.java:144) + at com.intellij.openapi.progress.impl.CoreProgressManager$4.run(CoreProgressManager.java:395) + at com.intellij.openapi.application.impl.ApplicationImpl$1.run(ApplicationImpl.java:314) + at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) + at java.util.concurrent.FutureTask.run(FutureTask.java:266) + at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) + at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) + at java.lang.Thread.run(Thread.java:745) diff --git a/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml new file mode 100644 index 0000000..3473dc6 --- /dev/null +++ b/.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml @@ -0,0 +1,2144 @@ + + + + + 10.3.10 + MARIADB + InnoDB + lower/lower + + + 1 + 1 + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + utf8_general_ci + + + latin1_swedish_ci + + + utf8_general_ci + + + armscii8 + 0 + + + armscii8 + 1 + + + armscii8 + 0 + + + armscii8 + 0 + + + ascii + 0 + + + ascii + 1 + + + ascii + 0 + + + ascii + 0 + + + big5 + 0 + + + big5 + 1 + + + big5 + 0 + + + big5 + 0 + + + binary + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 1 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1250 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 1 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1251 + 0 + + + cp1256 + 0 + + + cp1256 + 1 + + + cp1256 + 0 + + + cp1256 + 0 + + + cp1257 + 0 + + + cp1257 + 1 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp1257 + 0 + + + cp850 + 0 + + + cp850 + 1 + + + cp850 + 0 + + + cp850 + 0 + + + cp852 + 0 + + + cp852 + 1 + + + cp852 + 0 + + + cp852 + 0 + + + cp866 + 0 + + + cp866 + 1 + + + cp866 + 0 + + + cp866 + 0 + + + cp932 + 0 + + + cp932 + 1 + + + cp932 + 0 + + + cp932 + 0 + + + dec8 + 0 + + + dec8 + 0 + + + dec8 + 1 + + + dec8 + 0 + + + eucjpms + 0 + + + eucjpms + 1 + + + eucjpms + 0 + + + eucjpms + 0 + + + euckr + 0 + + + euckr + 1 + + + euckr + 0 + + + euckr + 0 + + + gb2312 + 0 + + + gb2312 + 1 + + + gb2312 + 0 + + + gb2312 + 0 + + + gbk + 0 + + + gbk + 1 + + + gbk + 0 + + + gbk + 0 + + + geostd8 + 0 + + + geostd8 + 1 + + + geostd8 + 0 + + + geostd8 + 0 + + + greek + 0 + + + greek + 1 + + + greek + 0 + + + greek + 0 + + + hebrew + 0 + + + hebrew + 1 + + + hebrew + 0 + + + hebrew + 0 + + + hp8 + 0 + + + hp8 + 1 + + + hp8 + 0 + + + hp8 + 0 + + + keybcs2 + 0 + + + keybcs2 + 1 + + + keybcs2 + 0 + + + keybcs2 + 0 + + + koi8r + 0 + + + koi8r + 1 + + + koi8r + 0 + + + koi8r + 0 + + + koi8u + 0 + + + koi8u + 1 + + + koi8u + 0 + + + koi8u + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 0 + + + latin1 + 1 + + + latin1 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 1 + + + latin2 + 0 + + + latin2 + 0 + + + latin2 + 0 + + + latin5 + 0 + + + latin5 + 0 + + + latin5 + 1 + + + latin5 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 1 + + + latin7 + 0 + + + latin7 + 0 + + + latin7 + 0 + + + macce + 0 + + + macce + 1 + + + macce + 0 + + + macce + 0 + + + macroman + 0 + + + macroman + 1 + + + macroman + 0 + + + macroman + 0 + + + sjis + 0 + + + sjis + 1 + + + sjis + 0 + + + sjis + 0 + + + swe7 + 0 + + + swe7 + 0 + + + swe7 + 1 + + + swe7 + 0 + + + tis620 + 0 + + + tis620 + 0 + + + tis620 + 1 + + + tis620 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 1 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ucs2 + 0 + + + ujis + 0 + + + ujis + 1 + + + ujis + 0 + + + ujis + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 1 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16 + 0 + + + utf16le + 0 + + + utf16le + 1 + + + utf16le + 0 + + + utf16le + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 1 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf32 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 1 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 1 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + utf8mb4 + 0 + + + 管理员 +
+ + 公告 +
+ + 毕业设计 +
+ + 毕设论文 +
+ + 指导老师评定成绩 +
+ + 评阅老师对论文的评审成绩 +
+ + 毕业设计信息 +
+ + 开题报告 +
+ + 开题报告会纪要 +
+ + 答辩 +
+ + 答辩记录表 +
+ + 开题报告秘书组 +
+ + 开题报告老师组 +
+ + 专业信息 +
+ + 答辩秘书小组 +
+ + 答辩教师组 +
+ + 学生用户 +
+ + 老师用户 +
+ + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + varchar(255)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 4 + char(1)|0s + normal + + + 5 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + int(11)|0s + normal + + + 3 + date|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + text|0s + normal + + + 6 + text|0s + normal + + + 7 + text|0s + normal + + + 8 + text|0s + normal + + + 9 + float|0s + normal + + + 10 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + float|0s + normal + + + 3 + float|0s + normal + + + 4 + float|0s + normal + + + 5 + float|0s + normal + + + 6 + float|0s + normal + + + 7 + float|0s + normal + + + 8 + float|0s + normal + + + 9 + float|0s + normal + + + 10 + float|0s + normal + + + 11 + float|0s + normal + + + 12 + float|0s + normal + + + 13 + float|0s + normal + + + 14 + float|0s + normal + + + 15 + float|0s + normal + + + 16 + float|0s + normal + + + 17 + text|0s + normal + + + 18 + date|0s + normal + + + 19 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + float|0s + normal + + + 3 + text|0s + normal + + + 4 + date|0s + normal + + + 5 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + varchar(255)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + text|0s + normal + + + 8 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(20)|0s + normal + + + 7 + int(11)|0s + normal + + + 8 + char(1)|0s + normal + + + 9 + char(1)|0s + normal + + + 10 + char(1)|0s + normal + + + 11 + char(1)|0s + normal + + + 12 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + date|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + text|0s + normal + + + 7 + date|0s + normal + + + 8 + text|0s + normal + + + 9 + date|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + date|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + char(20)|0s + normal + + + 5 + char(20)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + text|0s + normal + + + 3 + date|0s + normal + + + 4 + text|0s + normal + + + 5 + date|0s + normal + + + 6 + text|0s + normal + + + 7 + float|0s + normal + + + 8 + date|0s + normal + + + 9 + text|0s + normal + + + 10 + float|0s + normal + + + 11 + date|0s + normal + + + 12 + text|0s + normal + + + 13 + float|0s + normal + + + 14 + date|0s + normal + + + 15 + char(1)|0s + normal + + + 16 + char(1)|0s + normal + + + 17 + char(1)|0s + normal + + + 18 + char(1)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(8)|0s + 1 + normal + + + 2 + varchar(255)|0s + normal + + + 3 + varchar(255)|0s + normal + + + 4 + varchar(255)|0s + normal + + + 1 + profession_code + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_student_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(20)|0s + normal + + + 3 + char(20)|0s + normal + + + 1 + leader_teacher_id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + char(4)|0s + normal + + + 7 + char(8)|0s + normal + + + 1 + id + 1 + + + 1 + char(20)|0s + 1 + normal + + + 2 + char(255)|0s + 1 + normal + + + 3 + char(30)|0s + normal + + + 4 + char(40)|0s + normal + + + 5 + char(20)|0s + normal + + + 6 + varchar(255)|0s + normal + + + 7 + varchar(255)|0s + normal + + + 8 + char(8)|0s + normal + + + 1 + id + 1 + + + \ No newline at end of file From 4fe5018fe4d303f909b79cf880d2a524b36cabcc Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Tue, 15 Jan 2019 16:33:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0iconurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/vcs.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 8306744..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - \ No newline at end of file From 564dfcc57ac0b16a84d569566deef0fcd419ffc5 Mon Sep 17 00:00:00 2001 From: zgl <1021946233@qq.com> Date: Tue, 15 Jan 2019 16:46:44 +0800 Subject: [PATCH 3/5] Merge remote-tracking branch 'remotes/origin/wmj' into zgl # Conflicts: # .idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml --- src/core/process/C_CollegeFillScoreOpinion.java | 2 +- src/core/process/C_MentorFillOpeningReportOpinion.java | 2 +- src/core/process/C_MentorFillReview.java | 2 +- src/core/process/C_ReviewerFillReview.java | 2 +- src/core/process/C_SchoolFillScoreOpinion.java | 2 +- src/core/process/C_SecretaryFillOpeningReportOpinion.java | 2 +- src/core/process/C_SecretaryFillReplyRecord.java | 2 +- src/core/process/C_StudentSelectTeacher.java | 2 +- src/core/process/C_StudentUploadFinishedProduct.java | 2 +- src/core/process/C_StudentUploadOpeningReport.java | 2 +- src/core/process/C_TeacherTeamFillOpeningReportOpinion.java | 2 +- src/core/process/C_TeacherTeamFillScoreOpinion.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/process/C_CollegeFillScoreOpinion.java b/src/core/process/C_CollegeFillScoreOpinion.java index 7a95609..35905b2 100644 --- a/src/core/process/C_CollegeFillScoreOpinion.java +++ b/src/core/process/C_CollegeFillScoreOpinion.java @@ -13,7 +13,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="学院老师评分"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index a63308b..d7b9767 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -13,7 +13,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="导师开题意见"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_opening_report_opinion_record"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java index fb9c53a..c20ba27 100644 --- a/src/core/process/C_MentorFillReview.java +++ b/src/core/process/C_MentorFillReview.java @@ -13,7 +13,7 @@ public class C_MentorFillReview extends TempProcess { public String graduationDesignId; public Map vMap; private static String buttonName ="指导老师评阅"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_finished_product_mentor_score"; public void teacherTeamFillOpeningReportOpinion() throws Exception{ diff --git a/src/core/process/C_ReviewerFillReview.java b/src/core/process/C_ReviewerFillReview.java index c7bd9f2..b8245bb 100644 --- a/src/core/process/C_ReviewerFillReview.java +++ b/src/core/process/C_ReviewerFillReview.java @@ -12,7 +12,7 @@ public class C_ReviewerFillReview extends TempProcess { public String graduationDesignId; public Map vMap; private static String buttonName ="评阅老师评阅"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_finished_product_reviewer_score"; diff --git a/src/core/process/C_SchoolFillScoreOpinion.java b/src/core/process/C_SchoolFillScoreOpinion.java index 169bd3c..04ff39b 100644 --- a/src/core/process/C_SchoolFillScoreOpinion.java +++ b/src/core/process/C_SchoolFillScoreOpinion.java @@ -13,7 +13,7 @@ public class C_SchoolFillScoreOpinion extends TempProcess { String graduationDesignId; Map vMap; private static String buttonName ="学院老师评分"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_reply_opinion_record_score"; public void fillInformation() throws Exception{ diff --git a/src/core/process/C_SecretaryFillOpeningReportOpinion.java b/src/core/process/C_SecretaryFillOpeningReportOpinion.java index 259c64d..bcb65a5 100644 --- a/src/core/process/C_SecretaryFillOpeningReportOpinion.java +++ b/src/core/process/C_SecretaryFillOpeningReportOpinion.java @@ -13,7 +13,7 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="提交开题纪要"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_opening_report_opinion_record"; diff --git a/src/core/process/C_SecretaryFillReplyRecord.java b/src/core/process/C_SecretaryFillReplyRecord.java index b98ee8a..a49b405 100644 --- a/src/core/process/C_SecretaryFillReplyRecord.java +++ b/src/core/process/C_SecretaryFillReplyRecord.java @@ -13,7 +13,7 @@ public class C_SecretaryFillReplyRecord extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="提交答辩记录"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_reply_opinion_record_score"; diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index b85e6a8..97c1759 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -12,7 +12,7 @@ public class C_StudentSelectTeacher extends TempProcess { String studentId; String teacherId; private static String buttonName ="选择老师"; - protected static String iconURL="\"../cssFile/images/select.png\""; + protected static String iconURL="../cssFile/images/select.png"; public void select()throws Exception{ if(!check()) throw new GExcptInit("ID Attrs init error!"); diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java index 78a1652..55e7207 100644 --- a/src/core/process/C_StudentUploadFinishedProduct.java +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -12,7 +12,7 @@ public class C_StudentUploadFinishedProduct { File finishedProduct; String graduationDesignId; private static String buttonName ="提交定稿"; - protected static String iconURL="\"../cssFile/images/upload.png\""; + protected static String iconURL="../cssFile/images/upload.png"; static String file_type = "finished_product"; public void uploadOpeningReport() throws Exception{ diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java index 3ea9ea7..f8bbb54 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -12,7 +12,7 @@ public class C_StudentUploadOpeningReport extends TempProcess{ String graduationDesignId; private static String buttonName ="提交开题报告"; static String file_type = "opening_report"; - protected static String iconURL="\"../cssFile/images/upload.png\""; + protected static String iconURL="../cssFile/images/upload.png"; public void uploadOpeningReport() throws Exception{ if(!check()) throw new GExcptInit("Upload OpeningReport Attrs init error!"); diff --git a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java index 7f837ac..bb70fcd 100644 --- a/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java +++ b/src/core/process/C_TeacherTeamFillOpeningReportOpinion.java @@ -13,7 +13,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="开题小组意见"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; static String table="graduation_design_opening_report_opinion_record"; diff --git a/src/core/process/C_TeacherTeamFillScoreOpinion.java b/src/core/process/C_TeacherTeamFillScoreOpinion.java index 036aeda..35a48b3 100644 --- a/src/core/process/C_TeacherTeamFillScoreOpinion.java +++ b/src/core/process/C_TeacherTeamFillScoreOpinion.java @@ -11,7 +11,7 @@ import java.util.Map; public class C_TeacherTeamFillScoreOpinion extends TempProcess { private static String buttonName = "答辩小组评分"; - protected static String iconURL="\"../cssFile/images/fill.png\""; + protected static String iconURL="../cssFile/images/fill.png"; String graduationDesignId; Map vMap; From 6b6b333f46f60cac25e0d54dd55e3fbce69a6917 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Tue, 15 Jan 2019 17:37:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84process?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/process/C_MentorFillReview.java | 3 +- src/core/process/C_StudentSelectTeacher.java | 1 - .../C_StudentUploadFinishedProduct.java | 2 +- .../process/C_StudentUploadOpeningReport.java | 1 - src/core/process/ProcessManagement.java | 34 ++++++++++++++++++- 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/core/process/C_MentorFillReview.java b/src/core/process/C_MentorFillReview.java index 1da074f..49c6402 100644 --- a/src/core/process/C_MentorFillReview.java +++ b/src/core/process/C_MentorFillReview.java @@ -13,10 +13,9 @@ public class C_MentorFillReview extends TempProcess { public String graduationDesignId; public Map vMap; private static String buttonName ="指导老师评阅"; - protected static String iconURL="\"../cssFile/images/fill.png\""; protected static String targetURL="/home/mentor-fill-review"; - protected static String iconURL="../cssFile/images/fill.png"; + static String table="graduation_design_finished_product_mentor_score"; public void teacherTeamFillOpeningReportOpinion() throws Exception{ diff --git a/src/core/process/C_StudentSelectTeacher.java b/src/core/process/C_StudentSelectTeacher.java index 3577a9d..2a42db7 100644 --- a/src/core/process/C_StudentSelectTeacher.java +++ b/src/core/process/C_StudentSelectTeacher.java @@ -12,7 +12,6 @@ public class C_StudentSelectTeacher extends TempProcess { String studentId; String teacherId; private static String buttonName ="选择老师"; - protected static String iconURL="../cssFile/images/select.png"; protected static String targetURL="/home/student-select-teacher"; protected static String iconURL="../cssFile/images/select.png"; diff --git a/src/core/process/C_StudentUploadFinishedProduct.java b/src/core/process/C_StudentUploadFinishedProduct.java index 78e9d17..8bb0ea3 100644 --- a/src/core/process/C_StudentUploadFinishedProduct.java +++ b/src/core/process/C_StudentUploadFinishedProduct.java @@ -7,7 +7,7 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -public class C_StudentUploadFinishedProduct { +public class C_StudentUploadFinishedProduct extends TempProcess { File finishedProduct; String graduationDesignId; diff --git a/src/core/process/C_StudentUploadOpeningReport.java b/src/core/process/C_StudentUploadOpeningReport.java index 0c5ec47..3ccb7e3 100644 --- a/src/core/process/C_StudentUploadOpeningReport.java +++ b/src/core/process/C_StudentUploadOpeningReport.java @@ -12,7 +12,6 @@ public class C_StudentUploadOpeningReport extends TempProcess{ String graduationDesignId; private static String buttonName ="提交开题报告"; static String file_type = "opening_report"; - protected static String iconURL="../cssFile/images/upload.png"; protected static String targetURL="/home/student-upload-opening-report"; protected static String iconURL="../cssFile/images/upload.png"; diff --git a/src/core/process/ProcessManagement.java b/src/core/process/ProcessManagement.java index ee0fae9..a961f10 100644 --- a/src/core/process/ProcessManagement.java +++ b/src/core/process/ProcessManagement.java @@ -55,6 +55,38 @@ public class ProcessManagement { return status; } public static Process getProcess(String process){ - return null; + switch (process) { + case "teacher_choose_student_status": + return new C_TeacherSelectStudent(); + case "student_choose_teacher_status": + return new C_StudentSelectTeacher(); + case"student_fill_graduation_design_information_status": + return new C_StudentFillGraduationDesignInformation(); + case"opening_report_status": + return new C_StudentUploadOpeningReport(); + case"opening_report_mentor_opinion_status": + return new C_MentorFillOpeningReportOpinion(); + case"opening_report_teacher_team_opinion_status": + return new C_TeacherTeamFillOpeningReportOpinion(); + case"opening_report_college_opinion_status": + return new C_CollegeFillOpeningReportOpinion(); + case"opening_report_secretary_record_status": + return new C_SecretaryFillOpeningReportRecord(); + case"finished_product_status": + return new C_StudentUploadFinishedProduct(); + case"finished_product_mentor_score_status": + return new C_MentorFillReview(); + case"finished_product_reviewer_score_status": + return new C_ReviewerFillReview(); + case"reply_ secretary_record_status": + return new C_SecretaryFillReplyRecord(); + case"reply_ teacher_team_score_status": + return new C_TeacherFillTeamFillScoreOpinion(); + case"reply_college_score_status": + return new C_CollegeFillScoreOpinion(); + case"reply_school_score_status": + return new C_SchoolFillScoreOpinion(); + + } } } From 8af0c704a84ed09cbfa5b6eb2bcf8a2044150b01 Mon Sep 17 00:00:00 2001 From: wan <2499498893@qq.com> Date: Tue, 15 Jan 2019 17:41:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9iconurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/process/C_MentorFillOpeningReportOpinion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/process/C_MentorFillOpeningReportOpinion.java b/src/core/process/C_MentorFillOpeningReportOpinion.java index a199795..2c8d671 100644 --- a/src/core/process/C_MentorFillOpeningReportOpinion.java +++ b/src/core/process/C_MentorFillOpeningReportOpinion.java @@ -13,7 +13,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{ String graduationDesignId; Map vMap; private static String buttonName ="导师开题意见"; - protected static String iconURL="../cssFile/images/fill.png\"; + protected static String iconURL="../cssFile/images/fill.png"; protected static String targetURL="/home/mentor-fill-opening-report-opinion"; protected static String iconURL="../cssFile/images/fill.png";