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

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

src/core/process/C_CollegeFillOpeningReportOpinion.java

@@ -1,7 +1,9 @@
 package core.process;
 
 import core.operation.FillInformation;
+import dao.DBManagement;
 import error.GExcptInit;
+import error.GExcptSQL;
 import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
@@ -46,6 +48,11 @@ public class C_CollegeFillOpeningReportOpinion extends C_FillInformation{
         this.graduationDesignId = graduationDesignId;
     }
 
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table,fileds);
+    }
+
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }

src/core/process/C_CollegeFillScoreOpinion.java

@@ -1,7 +1,9 @@
 package core.process;
 
 import core.operation.FillInformation;
+import dao.DBManagement;
 import error.GExcptInit;
+import error.GExcptSQL;
 import gdms.Configuration;
 
 import java.text.SimpleDateFormat;
@@ -67,4 +69,9 @@ public class C_CollegeFillScoreOpinion extends C_FillInformation{
     public String getButtonName() {
         return buttonName;
     }
+
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table,fileds);
+    }
 }

src/core/process/C_MentorFillOpeningReportOpinion.java

@@ -2,9 +2,9 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +19,7 @@ public class C_MentorFillOpeningReportOpinion extends C_FillInformation{
     private static String info = "";
 
     private static String table="graduation_design_opening_report_opinion_record";
-    private static String fileds="opening_report_mentor_opinion_status";
+    private static String field ="opening_report_mentor_opinion_status";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@@ -50,6 +50,11 @@ public class C_MentorFillOpeningReportOpinion extends C_FillInformation{
         this.graduationDesignId = graduationDesignId;
     }
 
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }

src/core/process/C_MentorFillReview.java

@@ -2,9 +2,9 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +19,7 @@ public class C_MentorFillReview extends C_FillInformation {
     private static String info = "";
 
     private static String table="graduation_design_finished_product_mentor_score";
-    private static String fileds="finished_product_mentor_score_status";
+    private static String field ="finished_product_mentor_score_status";
 
     public void teacherTeamFillOpeningReportOpinion() throws Exception{
         if(!check()) throw new GExcptInit("MentorFillReview Attrs init error!");
@@ -49,6 +49,12 @@ public class C_MentorFillReview extends C_FillInformation {
     public void setGraduationDesignId(String graduationDesignId) {
         this.graduationDesignId = graduationDesignId;
     }
+
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }

src/core/process/C_ReviewerFillReview.java

@@ -2,9 +2,9 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -18,7 +18,7 @@ public class C_ReviewerFillReview extends C_FillInformation {
     private static String info = "";
 
     private static String table="graduation_design_finished_product_reviewer_score";
-    private static String fileds="finished_product_reviewer_score_status";
+    private static String field ="finished_product_reviewer_score_status";
 
     public void TeacherTeamFillOpeningReportOpinion() throws Exception{
         if(!check()) throw new GExcptInit("ReviewerFillReview Attrs init error!");
@@ -47,6 +47,12 @@ public class C_ReviewerFillReview extends C_FillInformation {
     public void setGraduationDesignId(String teacherID) {
         this.graduationDesignId = graduationDesignId;
     }
+
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     public Map<String, String> getVMap() {
         return vMap;
     }

src/core/process/C_SchoolFillScoreOpinion.java

@@ -2,9 +2,9 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +19,7 @@ public class C_SchoolFillScoreOpinion extends C_FillInformation {
     private static String info = "";
 
     private static String table="graduation_design_reply_opinion_record_score";
-    private static String fileds="reply_school_score_status";
+    private static String field ="reply_school_score_status";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@@ -48,6 +48,12 @@ public class C_SchoolFillScoreOpinion extends C_FillInformation {
     public void setGraduationDesignId(String graduationDesignId) {
         this.graduationDesignId = graduationDesignId;
     }
+
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }

src/core/process/C_SecretaryFillOpeningReportRecord.java

@@ -2,9 +2,9 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +19,7 @@ public class C_SecretaryFillOpeningReportRecord extends C_FillInformation{
     private static String info = "";
 
     private static String table="graduation_design_opening_report_opinion_record";
-    private static String fileds="opening_report_secretary_record_status";
+    private static String field ="opening_report_secretary_record_status";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@@ -49,6 +49,11 @@ public class C_SecretaryFillOpeningReportRecord extends C_FillInformation{
         this.graduationDesignId = graduationDesignId;
     }
 
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }

src/core/process/C_SecretaryFillReplyRecord.java

@@ -2,9 +2,9 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -19,7 +19,7 @@ public class C_SecretaryFillReplyRecord extends C_FillInformation{
     private static String info = "";
 
     private static String table="graduation_design_reply_opinion_record_score";
-    private static String fileds="reply_secretary_record_status";
+    private static String field ="reply_secretary_record_status";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs Init error!");
@@ -48,6 +48,11 @@ public class C_SecretaryFillReplyRecord extends C_FillInformation{
         this.graduationDesignId = graduationDesignId;
     }
 
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }

src/core/process/C_StudentFillGraduationDesignInformation.java

@@ -2,9 +2,8 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import error.GExcptSQL;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -17,7 +16,7 @@ public class C_StudentFillGraduationDesignInformation extends C_FillSbjMsg {
     private static String info = "";
 
     private static String table="graduation_design_information";
-    private static String fileds="student_fill_graduation_design_information_status";
+    private static String field ="student_fill_graduation_design_information_status";
 
     public void fillInformation() throws Exception{
         if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
@@ -45,6 +44,11 @@ public class C_StudentFillGraduationDesignInformation extends C_FillSbjMsg {
         this.graduationDesignId = graduationDesignId;
     }
 
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }

src/core/process/C_StudentSelectTeacher.java

@@ -3,6 +3,7 @@ package core.process;
 import core.operation.Search;
 import core.operation.Select;
 import error.GExcptInit;
+import error.GExcptSQL;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,7 +19,7 @@ public class C_StudentSelectTeacher extends C_Select {
     private static String info = "";
 
     private static String table="graduation_design";
-    private static String fileds="student_choose_teacher_status";
+    private static String field ="student_choose_teacher_status";
 
 
     public void select()throws Exception{
@@ -90,4 +91,8 @@ public class C_StudentSelectTeacher extends C_Select {
         return buttonName;
     }
 
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(this.getGraduationDesignId(),table, field);
+    }
 }

src/core/process/C_StudentUploadFinishedProduct.java

@@ -2,6 +2,7 @@ package core.process;
 
 import core.operation.UploadFile;
 import error.GExcptInit;
+import error.GExcptSQL;
 
 import java.io.File;
 import java.util.HashMap;
@@ -17,7 +18,7 @@ public class C_StudentUploadFinishedProduct extends C_UploadFile {
     private static String info = "";
 
     private static String table="graduation_design_finished_product";
-    private static String fileds="finished_product_status";
+    private static String field ="finished_product_status";
 
     static String file_type = "finished_product";
     public void uploadOpeningReport() throws Exception{
@@ -53,6 +54,11 @@ public class C_StudentUploadFinishedProduct extends C_UploadFile {
         this.graduationDesignId = graduationDesignId;
     }
 
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     @Override
     public String getInfo() {
         return info;

src/core/process/C_StudentUploadOpeningReport.java

@@ -2,6 +2,7 @@ package core.process;
 
 import core.operation.UploadFile;
 import error.GExcptInit;
+import error.GExcptSQL;
 
 import java.io.File;
 import java.util.HashMap;
@@ -17,7 +18,7 @@ public class C_StudentUploadOpeningReport extends C_UploadFile{
     private static String info = "";
 
     private static String table="graduation_design_opening_report";
-    private static String fileds="opening_report_status";
+    private static String field ="opening_report_status";
 
     public void uploadOpeningReport() throws Exception{
         if(!check()) throw new GExcptInit("Upload OpeningReport Attrs init error!");
@@ -54,6 +55,11 @@ public class C_StudentUploadOpeningReport extends C_UploadFile{
         this.graduationDesignId = graduationDesignId;
     }
 
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     @Override
     public String getInfo() {
         return info;

src/core/process/C_TeacherSelectStudent.java

@@ -3,6 +3,7 @@ package core.process;
 import core.operation.Search;
 import core.operation.Select;
 import error.GExcptInit;
+import error.GExcptSQL;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,7 +19,7 @@ public class C_TeacherSelectStudent extends C_Select {
     private static String info = "";
 
     private static String table="graduation_design";
-    private static String fileds="teacher_choose_student_status";
+    private static String field ="teacher_choose_student_status";
 
     public void select()throws Exception{
         if(!check()) throw new GExcptInit("ID Attrs init error!");
@@ -88,4 +89,8 @@ public class C_TeacherSelectStudent extends C_Select {
         return buttonName;
     }
 
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(this.getGraduationDesignId(),table, field);
+    }
 }

src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

@@ -2,9 +2,9 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -18,7 +18,7 @@ public class C_TeacherTeamFillOpeningReportOpinion extends C_FillInformation{
     private static String targetURL="/home/teacher-team-fill-opening-report-opinion";
     private static String info = "";
 
-    private static String fileds="opening_report_teacher_team_opinion_status";
+    private static String field ="opening_report_teacher_team_opinion_status";
     private static String table="graduation_design_opening_report_opinion_record";
 
     public void fillInformation() throws Exception{
@@ -49,6 +49,11 @@ public class C_TeacherTeamFillOpeningReportOpinion extends C_FillInformation{
         this.graduationDesignId = graduationDesignId;
     }
 
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }

src/core/process/C_TeacherTeamFillScoreOpinion.java

@@ -2,9 +2,9 @@ package core.process;
 
 import core.operation.FillInformation;
 import error.GExcptInit;
+import error.GExcptSQL;
 import gdms.Configuration;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -20,7 +20,7 @@ public class C_TeacherTeamFillScoreOpinion extends C_FillInformation {
     private static String info = "";
 
     private static String table="graduation_design_reply_opinion_record_score";
-    private static String fileds="reply_teacher_team_score_status";
+    private static String field ="reply_teacher_team_score_status";
 
 
     public void fillInformation() throws Exception{
@@ -71,6 +71,12 @@ public class C_TeacherTeamFillScoreOpinion extends C_FillInformation {
     public void setGraduationDesignId(String graduationDesignId) {
         this.graduationDesignId = graduationDesignId;
     }
+
+    @Override
+    public void updateStatus() throws GExcptSQL {
+        core.process.Utils.updateStatus(graduationDesignId,table, field);
+    }
+
     public void setVMap(Map<String, String> vMap) {
         this.vMap = vMap;
     }

src/core/process/TempProcess.java

@@ -1,11 +1,13 @@
 package core.process;
 
+import error.GExcptSQL;
+
 public abstract class TempProcess extends Process {
     private static String process;
     private static String nextProcess;
-    private String graduationDesignId;
+    protected String graduationDesignId;
-    private static String table;
+    protected static String table;
-    private static String fileds;
+    protected static String field;
 
     public String getGraduationDesignId() {
         return graduationDesignId;
@@ -31,7 +33,5 @@ public abstract class TempProcess extends Process {
         TempProcess.nextProcess = nextProcess;
     }
 
-    public void updateStatus(){
+    public abstract void updateStatus() throws GExcptSQL;
-        System.out.println(table+" "+fileds);
-    }
 }

src/core/process/Utils.java

@@ -1,5 +1,8 @@
 package core.process;
 
+import dao.DBManagement;
+import error.GExcptSQL;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -15,4 +18,10 @@ public interface Utils {
             studentsInfo.add(studentInfo);
         }
     }
+
+    static void updateStatus(String id, String table, String field) throws GExcptSQL {
+        Map<String,String> limits = new HashMap<>();
+        limits.put("id",id);
+        DBManagement.updateStatus(table,field,"2",limits);
+    }
 }

src/dao/DBManagement.java

@@ -171,6 +171,11 @@ public class DBManagement {
         String sql = update.getSQL();
         update(sql);
     }
+    public static void updateStatus(String table, String field, String increment, Map<String,String> limits) throws GExcptSQL {
+        UpdateStatus us = new UpdateStatus(table,field,increment,limits);
+        String sql = us.getSQL();
+        update(sql);
+    }
     public static void updateAll(String table, List<String> fields, String increment) throws GExcptSQL {
         UpdateAll updateAll = new UpdateAll(table,fields,increment);
         String sql = updateAll.getSQL();

src/dao/UpdateStatus.java

@@ -1,4 +1,58 @@
 package dao;
 
-public class UpdateStatus {
+import java.util.Map;
+
+public class UpdateStatus extends SQLStmt {
+    static String fs = "UPDATE ";
+    String field;
+    String increment;
+    Map<String,String> limits;
+    public UpdateStatus(String table, String field, String increment, Map<String, String> limits) {
+        super(table);
+        this.setField(field);
+        this.setIncrement(increment);
+        this.setLimits(limits);
+    }
+
+    @Override
+    public String getSQL() {
+        return getFs()+getUs()+getLs();
+    }
+
+    @Override
+    public String getFs() {
+        return fs+this.getTable()+" ";
+    }
+    private String getLs(){
+        return dao.Utils.whereAnd(this.getLimits());
+    }
+    public String getUs(){
+        String us = "SET ";
+        us+=this.getField()+" = "+this.getField()+" + "+this.getIncrement()+" ";
+        return us;
+    }
+
+    public String getField() {
+        return field;
+    }
+
+    public void setField(String field) {
+        this.field = field;
+    }
+
+    public String getIncrement() {
+        return increment;
+    }
+
+    public void setIncrement(String increment) {
+        this.increment = increment;
+    }
+
+    public Map<String, String> getLimits() {
+        return limits;
+    }
+
+    public void setLimits(Map<String, String> limits) {
+        this.limits = limits;
+    }
 }

src/gdms/test.java

@@ -5,8 +5,10 @@ import core.process.C_StudentSelectTeacher;
 import dao.DBManagement;
 import dao.Select;
 import dao.UpdateAll;
+import dao.UpdateStatus;
 import error.GExcptFormat;
 import error.GExcptInit;
+import error.GExcptSQL;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -15,6 +17,14 @@ import java.util.Map;
 
 public class test {
     public static void main(String[] args){
-        new C_StudentSelectTeacher().updateStatus();
+        try {
+            new C_StudentSelectTeacher().updateStatus();
+        } catch (GExcptSQL gExcptSQL) {
+            gExcptSQL.printStackTrace();
+        }
+        Map<String,String> limits = new HashMap<>();
+        limits.put("id","100");
+        UpdateStatus us = new UpdateStatus("table","field","1",limits);
+        System.out.println(us.getSQL());
     }
 }