Merge remote-tracking branch 'remotes/origin/wmj' into zgl

# Conflicts:
#	.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.corrupted.20190114-065036.xml

.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)

src/core/process/C_CollegeFillOpeningReportOpinion.java

@@ -12,6 +12,9 @@ public class C_CollegeFillOpeningReportOpinion extends TempProcess{
     String graduationDesignId;
     Map<String,String> vMap;
     private static String buttonName ="学院开题意见";
+    protected static String iconURL="../cssFile/images/fill.png";
+    protected static String targetURL="";
+
     static  String table="graduation_design_opening_report_opinion_record";
 
     public void fillInformation() throws Exception {

src/core/process/C_CollegeFillScoreOpinion.java

@@ -13,6 +13,7 @@ public class C_CollegeFillScoreOpinion extends TempProcess{
     String graduationDesignId;
     Map<String,String> vMap;
     private static String buttonName ="学院老师评分";
+    protected static String iconURL="\"../cssFile/images/fill.png\"";
     static  String table="graduation_design_reply_opinion_record_score";
 
     public void fillInformation() throws Exception{

src/core/process/C_MentorFillOpeningReportOpinion.java

@@ -13,6 +13,7 @@ public class C_MentorFillOpeningReportOpinion extends TempProcess{
     String graduationDesignId;
     Map<String,String> vMap;
     private static String buttonName ="导师开题意见";
+    protected static String iconURL="\"../cssFile/images/fill.png\"";
     static String table="graduation_design_opening_report_opinion_record";
 
     public void fillInformation() throws Exception{

src/core/process/C_MentorFillReview.java

@@ -13,6 +13,7 @@ public class C_MentorFillReview extends TempProcess {
     public String  graduationDesignId;
     public Map<String,String> vMap;
     private static String buttonName ="指导老师评阅";
+    protected static String iconURL="\"../cssFile/images/fill.png\"";
     static String table="graduation_design_finished_product_mentor_score";
 
     public void teacherTeamFillOpeningReportOpinion() throws Exception{

src/core/process/C_ReviewerFillReview.java

@@ -12,6 +12,8 @@ public class C_ReviewerFillReview extends TempProcess {
     public String graduationDesignId;
     public Map<String,String> vMap;
     private static String buttonName ="评阅老师评阅";
+    protected static String iconURL="\"../cssFile/images/fill.png\"";
+
     static String table="graduation_design_finished_product_reviewer_score";
 
     public void TeacherTeamFillOpeningReportOpinion() throws Exception{

src/core/process/C_SchoolFillScoreOpinion.java

@@ -13,6 +13,8 @@ public class C_SchoolFillScoreOpinion extends TempProcess {
     String graduationDesignId;
     Map<String,String> vMap;
     private static String buttonName ="学院老师评分";
+    protected static String iconURL="\"../cssFile/images/fill.png\"";
+
     static String table="graduation_design_reply_opinion_record_score";
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");

src/core/process/C_SecretaryFillOpeningReportOpinion.java

@@ -13,6 +13,8 @@ public class C_SecretaryFillOpeningReportOpinion extends TempProcess{
     String graduationDesignId;
     Map<String,String> vMap;
     private static String buttonName ="提交开题纪要";
+    protected static String iconURL="\"../cssFile/images/fill.png\"";
+
     static  String table="graduation_design_opening_report_opinion_record";
 
     public void fillInformation() throws Exception{

src/core/process/C_SecretaryFillReplyRecord.java

@@ -13,6 +13,8 @@ public class C_SecretaryFillReplyRecord extends TempProcess{
     String graduationDesignId;
     Map<String,String> vMap;
     private static String buttonName ="提交答辩记录";
+    protected static String iconURL="\"../cssFile/images/fill.png\"";
+
     static  String table="graduation_design_reply_opinion_record_score";
 
     public void fillInformation() throws Exception{

src/core/process/C_StudentFillGraduationDesignInformation.java

@@ -12,6 +12,8 @@ public class C_StudentFillGraduationDesignInformation extends TempProcess{
     String graduationDesignId;
     Map<String,String> vMap;
     private static String buttonName ="填写选题信息";
+    protected static String iconURL="../cssFile/images/filText.png";
+
     static  String table="graduation_design_opening_report_opinion_record";
 
     public void fillInformation() throws Exception{

src/core/process/C_StudentSelectTeacher.java

@@ -12,6 +12,8 @@ public class C_StudentSelectTeacher extends TempProcess {
     String studentId;
     String teacherId;
     private static String buttonName ="选择老师";
+    protected static String iconURL="\"../cssFile/images/select.png\"";
+
     public void select()throws Exception{
         if(!check()) throw new GExcptInit("ID Attrs init error!");
         Select select=new Select();

src/core/process/C_StudentUploadFinishedProduct.java

@@ -12,6 +12,8 @@ public class C_StudentUploadFinishedProduct {
     File finishedProduct;
     String graduationDesignId;
     private static String buttonName ="提交定稿";
+    protected static String iconURL="\"../cssFile/images/upload.png\"";
+
     static String file_type = "finished_product";
     public void uploadOpeningReport() throws Exception{
         if(!check()) throw new GExcptInit("Upload FinishedProduct Attrs init error!");

src/core/process/C_StudentUploadOpeningReport.java

@@ -12,6 +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\"";
 
     public void uploadOpeningReport() throws Exception{
         if(!check()) throw new GExcptInit("Upload OpeningReport Attrs init error!");

src/core/process/C_TeacherSelectStudent.java

@@ -12,6 +12,7 @@ public class C_TeacherSelectStudent extends TempProcess {
     String studentId;
     String teacherId;
     private static String buttonName ="选择学生";
+    protected static String iconURL="";
 
     public void select()throws Exception{
         if(!check()) throw new GExcptInit("ID Attrs init error!");

src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

@@ -13,6 +13,8 @@ public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
     String graduationDesignId;
     Map<String,String> vMap;
     private static String buttonName ="开题小组意见";
+    protected static String iconURL="\"../cssFile/images/fill.png\"";
+
     static  String table="graduation_design_opening_report_opinion_record";
 
     public void fillInformation() throws Exception{

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\"";
     String graduationDesignId;
     Map<String,String> vMap;