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

# Conflicts:
#	.idea/dataSources/9ab10673-d584-44a7-a783-8ac833d52c51.xml

src/core/process/C_CollegeFillOpeningReportOpinion.java

@@ -12,12 +12,13 @@ import java.util.Map;
 public class C_CollegeFillOpeningReportOpinion extends C_FillInformation{
     String graduationDesignId;
     Map<String,String> vMap;
-    protected static String buttonName ="学院开题意见";
+    private static String buttonName ="学院开题意见";
-    protected static String iconURL="../cssFile/images/fill.png";
+    private static String iconURL="../cssFile/images/fill.png";
-    protected static String targetURL="/home/college-fill-opening-report-opinion";
+    private static String targetURL="/home/college-fill-opening-report-opinion";
-    protected static String info = "";
+    private static String info = "";
 
-    static  String table="graduation_design_opening_report_opinion_record";
+    private static  String table="graduation_design_opening_report_opinion_record";
+    private static String  fileds="opening_report_college_opinion_status";
 
     public void fillInformation() throws Exception {
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@@ -30,6 +31,7 @@ public class C_CollegeFillOpeningReportOpinion extends C_FillInformation{
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
     }
     protected boolean check() {
         if(this.getGraduationDesignId()==null||this.getVMap()==null)

src/core/process/C_CollegeFillScoreOpinion.java

@@ -13,11 +13,13 @@ public class C_CollegeFillScoreOpinion extends C_FillInformation{
 
     String graduationDesignId;
     Map<String,String> vMap;
-    protected static String buttonName ="学院老师评分";
+    private static String buttonName ="学院老师评分";
-    protected static String iconURL="../cssFile/images/fill.png";
+    private static String iconURL="../cssFile/images/fill.png";
-    protected static String targetURL="/home/college-fill-score-opinion";
+    private static String targetURL="/home/college-fill-score-opinion";
-    static  String table="graduation_design_reply_opinion_record_score";
+    private static String info = "";
-    protected static String info = "";
+
+    private static String table="graduation_design_reply_opinion_record_score";
+    private static String fileds="reply_college_score_status";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs Init error!");
@@ -30,6 +32,7 @@ public class C_CollegeFillScoreOpinion extends C_FillInformation{
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
 
     }
     protected boolean check() {

src/core/process/C_MentorFillOpeningReportOpinion.java

@@ -13,12 +13,13 @@ public class C_MentorFillOpeningReportOpinion extends C_FillInformation{
 
     String graduationDesignId;
     Map<String,String> vMap;
-    protected static String buttonName ="导师开题意见";
+    private static String buttonName ="导师开题意见";
-    protected static String iconURL="../cssFile/images/fill.png";
+    private static String iconURL="../cssFile/images/fill.png";
-    protected static String targetURL="/home/mentor-fill-opening-report-opinion";
+    private static String targetURL="/home/mentor-fill-opening-report-opinion";
-    protected static String info = "";
+    private static String info = "";
 
-    static String table="graduation_design_opening_report_opinion_record";
+    private static String table="graduation_design_opening_report_opinion_record";
+    private static String fileds="opening_report_mentor_opinion_status";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@@ -31,6 +32,7 @@ public class C_MentorFillOpeningReportOpinion extends C_FillInformation{
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
 
     }
     protected boolean check() {

src/core/process/C_MentorFillReview.java

@@ -13,12 +13,13 @@ public class C_MentorFillReview extends C_FillInformation {
 
     public String  graduationDesignId;
     public Map<String,String> vMap;
-    protected static String buttonName ="指导老师评阅";
+    private static String buttonName ="指导老师评阅";
-    protected static String targetURL="/home/mentor-fill-review";
+    private static String targetURL="/home/mentor-fill-review";
-    protected static String iconURL="../cssFile/images/fill.png";
+    private static String iconURL="../cssFile/images/fill.png";
-    protected static String info = "";
+    private static String info = "";
 
-    static String table="graduation_design_finished_product_mentor_score";
+    private static String table="graduation_design_finished_product_mentor_score";
+    private static String fileds="finished_product_mentor_score_status";
 
     public void teacherTeamFillOpeningReportOpinion() throws Exception{
         if(!check()) throw new GExcptInit("MentorFillReview Attrs init error!");
@@ -31,6 +32,7 @@ public class C_MentorFillReview extends C_FillInformation {
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
     }
 
     @Override

src/core/process/C_ReviewerFillReview.java

@@ -12,12 +12,13 @@ import java.util.Map;
 public class C_ReviewerFillReview extends C_FillInformation {
     public String graduationDesignId;
     public Map<String,String> vMap;
-    protected static String buttonName ="评阅老师评阅";
+    private static String buttonName ="评阅老师评阅";
-    protected static String iconURL="../cssFile/images/fill.png";
+    private static String iconURL="../cssFile/images/fill.png";
-    protected static String targetURL="/home/reviewer-fill-review";
+    private static String targetURL="/home/reviewer-fill-review";
-    protected static String info = "";
+    private static String info = "";
 
-    static String table="graduation_design_finished_product_reviewer_score";
+    private static String table="graduation_design_finished_product_reviewer_score";
+    private static String fileds="finished_product_reviewer_score_status";
 
     public void TeacherTeamFillOpeningReportOpinion() throws Exception{
         if(!check()) throw new GExcptInit("ReviewerFillReview Attrs init error!");
@@ -30,6 +31,7 @@ public class C_ReviewerFillReview extends C_FillInformation {
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
     }
 
     @Override

src/core/process/C_SchoolFillScoreOpinion.java

@@ -13,12 +13,14 @@ public class C_SchoolFillScoreOpinion extends C_FillInformation {
 
     String graduationDesignId;
     Map<String,String> vMap;
-    protected static String buttonName ="学院老师评分";
+    private static String buttonName ="学院老师评分";
-    protected static String iconURL="../cssFile/images/fill.png";
+    private static String iconURL="../cssFile/images/fill.png";
-    protected static String targetURL="/home/school-fill-score-opinion";
+    private static String targetURL="/home/school-fill-score-opinion";
-    protected static String info = "";
+    private static String info = "";
+
+    private static String table="graduation_design_reply_opinion_record_score";
+    private static String fileds="reply_school_score_status";
 
-    static String table="graduation_design_reply_opinion_record_score";
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
         FillInformation fillInformation=new FillInformation();
@@ -30,6 +32,7 @@ public class C_SchoolFillScoreOpinion extends C_FillInformation {
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
     }
     protected boolean check() {
         if(this.getGraduationDesignId()==null||this.getVMap()==null)

src/core/process/C_SecretaryFillOpeningReportRecord.java

@@ -13,12 +13,13 @@ public class C_SecretaryFillOpeningReportRecord extends C_FillInformation{
 
     String graduationDesignId;
     Map<String,String> vMap;
-    protected static String buttonName ="提交开题纪要";
+    private static String buttonName ="提交开题纪要";
-    protected static String iconURL="../cssFile/images/fill.png";
+    private static String iconURL="../cssFile/images/fill.png";
-    protected static String targetURL="/home/secretary-fill-opening-report-record";
+    private static String targetURL="/home/secretary-fill-opening-report-record";
-    protected static String info = "";
+    private static String info = "";
 
-    static  String table="graduation_design_opening_report_opinion_record";
+    private static String table="graduation_design_opening_report_opinion_record";
+    private static String fileds="opening_report_secretary_record_status";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@@ -31,6 +32,7 @@ public class C_SecretaryFillOpeningReportRecord extends C_FillInformation{
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
     }
     protected boolean check() {
         if(this.getGraduationDesignId()==null||this.getVMap()==null)

src/core/process/C_SecretaryFillReplyRecord.java

@@ -13,12 +13,13 @@ public class C_SecretaryFillReplyRecord extends C_FillInformation{
 
     String graduationDesignId;
     Map<String,String> vMap;
-    protected static String buttonName ="提交答辩记录";
+    private static String buttonName ="提交答辩记录";
-    protected static String iconURL="../cssFile/images/fill.png";
+    private static String iconURL="../cssFile/images/fill.png";
-    protected static String targetURL="/home/secretary-fill-reply-record";
+    private static String targetURL="/home/secretary-fill-reply-record";
-    protected static String info = "";
+    private static String info = "";
 
-    static  String table="graduation_design_reply_opinion_record_score";
+    private static String table="graduation_design_reply_opinion_record_score";
+    private static String fileds="reply_secretary_record_status";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs Init error!");
@@ -31,6 +32,7 @@ public class C_SecretaryFillReplyRecord extends C_FillInformation{
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
 
     }
     protected boolean check() {

src/core/process/C_StudentFillGraduationDesignInformation.java

@@ -11,12 +11,13 @@ import java.util.Map;
 public class C_StudentFillGraduationDesignInformation extends C_FillSbjMsg {
     String graduationDesignId;
     Map<String,String> vMap;
-    protected static String buttonName ="填写选题信息";
+    private static String buttonName ="填写选题信息";
-    protected static String iconURL="../cssFile/images/filText.png";
+    private static String iconURL="../cssFile/images/filText.png";
-    protected static String targetURL="/home/student-fill-graduation-design-information";
+    private static String targetURL="/home/student-fill-graduation-design-information";
-    protected static String info = "";
+    private static String info = "";
 
-    static  String table="graduation_design_opening_report_opinion_record";
+    private static String table="graduation_design_information";
+    private static String fileds="student_fill_graduation_design_information_status";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@@ -27,6 +28,7 @@ public class C_StudentFillGraduationDesignInformation extends C_FillSbjMsg {
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
     }
     protected boolean check() {
         if(this.getGraduationDesignId()==null||this.getVMap()==null)

src/core/process/C_StudentSelectTeacher.java

@@ -12,10 +12,14 @@ import java.util.Map;
 public class C_StudentSelectTeacher extends C_Select {
     String studentId;
     String teacherId;
-    protected String buttonName ="选择老师";
+    private static String buttonName ="选择老师";
-    protected static String targetURL="/home/student-select-teacher";
+    private static String targetURL="/home/student-select-teacher";
-    protected static String iconURL="../cssFile/images/select.png";
+    private static String iconURL="../cssFile/images/select.png";
-    protected static String info = "";
+    private static String info = "";
+
+    private static String table="graduation_design";
+    private static String fileds="student_choose_teacher_status";
+
 
     public void select()throws Exception{
         if(!check()) throw new GExcptInit("ID Attrs init error!");
@@ -24,6 +28,7 @@ public class C_StudentSelectTeacher extends C_Select {
         select.addOptions("student_id",this.getStudentId());
         select.addOptions("teacher_id",this.getTeacherId());
         Map<String,Object> options=select.execute(null);
+        updateStatus();
     }
     public List<Map<String,String>> search(String teacherId) throws Exception{
         Search search  = new Search() ;

src/core/process/C_StudentUploadFinishedProduct.java

@@ -11,10 +11,13 @@ public class C_StudentUploadFinishedProduct extends C_UploadFile {
 
     File finishedProduct;
     String graduationDesignId;
-    protected static String buttonName ="提交定稿";
+    private static String buttonName ="提交定稿";
-    protected static String iconURL="../cssFile/images/upload.png";
+    private static String iconURL="../cssFile/images/upload.png";
-    protected static String targetURL="/home/student-upload-finished-product";
+    private static String targetURL="/home/student-upload-finished-product";
-    protected static String info = "";
+    private static String info = "";
+
+    private static String table="graduation_design_finished_product";
+    private static String fileds="finished_product_status";
 
     static String file_type = "finished_product";
     public void uploadOpeningReport() throws Exception{
@@ -27,6 +30,7 @@ public class C_StudentUploadFinishedProduct extends C_UploadFile {
         limits.put("id",this.getGraduationDesignId());
         uploadFile.addOptions("limits",limits);
         uploadFile.execute(null);
+        updateStatus();
     }
 
     protected boolean check() {

src/core/process/C_StudentUploadOpeningReport.java

@@ -10,11 +10,14 @@ import java.util.Map;
 public class C_StudentUploadOpeningReport extends C_UploadFile{
     File openingReport;
     String graduationDesignId;
-    protected static String buttonName ="提交开题报告";
+    private static String buttonName ="提交开题报告";
-    static String file_type = "opening_report";
+    private static String file_type = "opening_report";
-    protected static String targetURL="/home/student-upload-opening-report";
+    private static String targetURL="/home/student-upload-opening-report";
-    protected static String iconURL="../cssFile/images/upload.png";
+    private static String iconURL="../cssFile/images/upload.png";
-    protected static String info = "";
+    private static String info = "";
+
+    private static String table="graduation_design_opening_report";
+    private static String fileds="opening_report_status";
 
     public void uploadOpeningReport() throws Exception{
         if(!check()) throw new GExcptInit("Upload OpeningReport Attrs init error!");

src/core/process/C_TeacherSelectStudent.java

@@ -12,10 +12,13 @@ import java.util.Map;
 public class C_TeacherSelectStudent extends C_Select {
     String studentId;
     String teacherId;
-    protected static String buttonName ="选择学生";
+    private static String buttonName ="选择学生";
-    protected static String iconURL="../cssFile/images/select.png";
+    private static String iconURL="../cssFile/images/select.png";
-    protected static String targetURL="/home/teacher-select-student";
+    private static String targetURL="/home/teacher-select-student";
-    protected static String info = "";
+    private static String info = "";
+
+    private static String table="graduation_design";
+    private static String fileds="teacher_choose_student_status";
 
     public void select()throws Exception{
         if(!check()) throw new GExcptInit("ID Attrs init error!");
@@ -24,6 +27,7 @@ public class C_TeacherSelectStudent extends C_Select {
         select.addOptions("teacher_id",this.getTeacherId());
         select.addOptions("student_id",this.getStudentId());
         Map<String,Object> options=select.execute(null);
+        updateStatus();
     }
     public List<Map<String,String>> search(String studentId) throws Exception{
         Search search  = new Search() ;

src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

@@ -13,12 +13,13 @@ public class C_TeacherTeamFillOpeningReportOpinion extends C_FillInformation{
 
     String graduationDesignId;
     Map<String,String> vMap;
-    protected static String buttonName ="开题小组意见";
+    private static String buttonName ="开题小组意见";
-    protected static String iconURL="../cssFile/images/fill.png";
+    private static String iconURL="../cssFile/images/fill.png";
-    protected static String targetURL="/home/teacher-team-fill-opening-report-opinion";
+    private static String targetURL="/home/teacher-team-fill-opening-report-opinion";
-    protected static String info = "";
+    private static String info = "";
 
-    static  String table="graduation_design_opening_report_opinion_record";
+    private static String fileds="opening_report_teacher_team_opinion_status";
+    private static String table="graduation_design_opening_report_opinion_record";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@@ -31,6 +32,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends C_FillInformation{
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
     }
     protected boolean check() {
         if(this.getGraduationDesignId()==null||this.getVMap()==null)

src/core/process/C_TeacherTeamFillScoreOpinion.java

@@ -11,14 +11,17 @@ import java.util.Map;
 
 public class C_TeacherTeamFillScoreOpinion extends C_FillInformation {
 
-    protected static String buttonName = "答辩小组评分";
-    protected static String iconURL="../cssFile/images/fill.png";
-    protected static String targetURL="/home/teacher-team-fill-score-opinion";
-    protected static String info = "";
     String graduationDesignId;
     Map<String,String> vMap;
 
-    static String table="graduation_design_reply_opinion_record_score";
+    private static String buttonName = "答辩小组评分";
+    private static String iconURL="../cssFile/images/fill.png";
+    private static String targetURL="/home/teacher-team-fill-score-opinion";
+    private static String info = "";
+
+    private static String table="graduation_design_reply_opinion_record_score";
+    private static String fileds="reply_teacher_team_score_status";
+
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@@ -31,6 +34,7 @@ public class C_TeacherTeamFillScoreOpinion extends C_FillInformation {
         limits.put("id",this.getGraduationDesignId());
         fillInformation.addOptions("limits",limits);
         fillInformation.execute(null);
+        updateStatus();
     }
     protected boolean check() {
         if(this.getGraduationDesignId()==null||this.getVMap()==null)

src/dao/UpdateStatus.java

@@ -0,0 +1,4 @@
+package dao;
+
+public class UpdateStatus {
+}