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] 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;