Merge remote-tracking branch 'origin/master'

.idea/artifacts/GDMS_war_exploded.xml

@@ -8,8 +8,8 @@
           <element id="module-output" name="GDMS" />
         </element>
         <element id="directory" name="lib">
-          <element id="file-copy" path="C:/Program Files/apache-tomcat-9.0.13/lib/tomcat-jdbc.jar" />
           <element id="library" level="project" name="lib" />
+          <element id="library" level="project" name="tomcat-lib" />
         </element>
       </element>
     </root>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

GDMS.iml

@@ -19,8 +19,8 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="lib" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
-    <orderEntry type="library" name="tomcat-lib" level="project" />
+    <orderEntry type="library" exported="" scope="PROVIDED" name="lib" level="project" />
+    <orderEntry type="library" exported="" scope="PROVIDED" name="Tomcat 8.5.37" level="application_server_libraries" />
+    <orderEntry type="library" scope="PROVIDED" name="tomcat-lib" level="project" />
   </component>
 </module>

src/core/process/C_CollegeFillOpeningReportOpinion.java

@@ -0,0 +1,56 @@
+package core.process;
+
+import core.operation.FillInformation;
+import error.GExcptInit;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class C_CollegeFillOpeningReportOpinion extends TempProcess{
+    String graduationDesignId;
+    String opening_report_college_teacher_id;
+    Map<String,String> vMap;
+
+    static  String table="graduation_design_opening_report_opinion_record";
+
+    public void fillInformation() throws Exception {
+        if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
+        FillInformation fillInformation =new FillInformation();
+        fillInformation.setOptions(new HashMap<>());
+        fillInformation.addOptions("table",table);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
+        String date=df.format(new Date());
+        vMap.put("college_opinion_date",date);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getGraduationDesignId());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+    }
+    protected boolean check() {
+        if(this.getOpening_report_college_teacher_id()==null||this.getGraduationDesignId()==null)
+            return false;
+        return true;
+    }
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
+
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
+    }
+
+    public String getOpening_report_college_teacher_id() {
+        return opening_report_college_teacher_id;
+    }
+
+    public void setOpening_report_college_teacher_id(String opening_report_college_teacher_id) {
+        this.opening_report_college_teacher_id = opening_report_college_teacher_id;
+    }
+
+    public void setvMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
+
+}

src/core/process/C_CollegeFillScoreOpinion.java

@@ -0,0 +1,37 @@
+package core.process;
+
+import core.operation.FillInformation;
+import error.GExcptInit;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class C_CollegeFillScoreOpinion extends TempProcess{
+
+    String graduationDesignId;
+    Map<String,String> vMap;
+
+    static  String table="graduation_design_reply_opinion_record_score";
+
+    public void fillInformation() throws Exception{
+        if(!check()) throw new GExcptInit("FillInformations Attrs Init error!");
+        FillInformation fillInformation=new FillInformation();
+        fillInformation.setOptions(new HashMap<>());
+        fillInformation.addOptions("table",table);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
+        String date=df.format(new Date());
+        vMap.put("secretary_record_date",date);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getGraduationDesignId());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+
+    }
+    protected boolean check() {
+        if(this.getGraduationDesignId()==null)
+            return false;
+        return true;
+    }
+}

src/core/process/C_MentorFillOpeningReportOpinion.java

@@ -3,15 +3,16 @@ package core.process;
 import core.operation.FillInformation;
 import error.GExcptInit;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-public class C_TeacherFillTopicInformation extends TempProcess{
+public class C_MentorFillOpeningReportOpinion extends TempProcess{
 
     String studentId;
     String  mentor_opinion;
-    Date mentor_opinion_date;
+    Map<String,String> vMap;
 
     static String table="graduation_design_opening_report_opinion_record";
 
@@ -20,10 +21,9 @@ public class C_TeacherFillTopicInformation extends TempProcess{
         FillInformation fillInformation=new FillInformation();
         fillInformation.setOptions(new HashMap<>());
         fillInformation.addOptions("table",table);
-        String date= mentor_opinion_date.toString();
-        Map<String,String> vMap=new HashMap<>();
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
+        String date=df.format(new Date());
         vMap.put("mentor_opinion_date",date);
-        vMap.put("mentor_opinion",this.getMentor_opinion());
         Map<String, String>limits = new HashMap<>();
         limits.put("id",this.getStudentId());
         fillInformation.addOptions("limits",limits);
@@ -31,7 +31,7 @@ public class C_TeacherFillTopicInformation extends TempProcess{
 
     }
     protected boolean check() {
-        if(this.getMentor_opinion()==null||this.getMentor_opinion_date()==null||this.getStudentId()==null)
+        if(this.getMentor_opinion()==null||this.getStudentId()==null)
             return false;
         return true;
     }
@@ -50,12 +50,7 @@ public class C_TeacherFillTopicInformation extends TempProcess{
         this.mentor_opinion = mentor_opinion;
     }
 
-    public Date getMentor_opinion_date() {
-        return mentor_opinion_date;
+    public void setvMap(Map<String, String> vMap) {
+        this.vMap = vMap;
     }
-
-    public void setMentor_opinion_date(Date mentor_opinion_date) {
-        this.mentor_opinion_date = mentor_opinion_date;
-    }
-
 }

src/core/process/C_MentorFillReview.java

@@ -0,0 +1,58 @@
+package core.process;
+
+import core.operation.FillInformation;
+import error.GExcptInit;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class C_MentorFillReview extends TempProcess {
+    public String teacherID;
+    public String teacher_opinion;
+    public Map<String,String> vMap;
+
+    static String table="graduation_design_finished_product_mentor_score";
+    public String getTeacher_opinion() {
+        return teacher_opinion;
+    }
+    public void setTeacher_opinion(String teacher_opinion) {
+        this.teacher_opinion = teacher_opinion;
+    }
+    public String getTeacherID() {
+        return teacherID;
+    }
+    public void setTeacherID(String teacherID) {
+        this.teacherID = teacherID;
+    }
+    public Map<String, String> getvMap() {
+        return vMap;
+    }
+    public void setvMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
+    public void TeacherTeamFillOpeningReportOpinion() throws Exception{
+        if(!check()) throw new GExcptInit("MentorFillReview Attrs init error!");
+        FillInformation fillInformation=new FillInformation();
+        fillInformation.setOptions(new HashMap<>());
+        fillInformation.addOptions("table",table);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
+        String date=df.format(new Date());
+        vMap.put("review_opinion_date",date);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getTeacherID());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+    }
+
+
+    @Override
+    protected boolean check() {
+        if(this.getTeacherID().equals(null)||this.getTeacher_opinion().equals(null)||this.getvMap().equals(null))
+        return false;
+        else
+            return true;
+    }
+}
+

src/core/process/C_SchoolFillScoreOpinion.java

@@ -0,0 +1,53 @@
+package core.process;
+
+import core.operation.FillInformation;
+import error.GExcptInit;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class C_SchoolFillScoreOpinion extends TempProcess {
+
+    String graduationDesignId;
+    Map<String,String> vMap;
+
+    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();
+        fillInformation.setOptions(new HashMap<>());
+        fillInformation.addOptions("table",table);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
+        String date=df.format(new Date());
+        vMap.put("school_opinion_date",date);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getGraduationDesignId());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+    }
+    protected boolean check() {
+        if(this.getGraduationDesignId()==null)
+            return false;
+        return true;
+    }
+    @Override
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
+
+    @Override
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
+    }
+    public void setvMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
+
+}
+
+
+
+
+

src/core/process/C_SecretaryFillOpeningReportOpinion.java

@@ -0,0 +1,50 @@
+package core.process;
+
+import core.operation.FillInformation;
+import error.GExcptInit;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class C_SecretaryFillOpeningReportOpinion extends TempProcess{
+
+    String graduationDesignId;
+    Map<String,String> vMap;
+
+    static  String table="graduation_design_opening_report_opinion_record";
+
+    public void fillInformation() throws Exception{
+        if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
+        FillInformation fillInformation=new FillInformation();
+        fillInformation.setOptions(new HashMap<>());
+        fillInformation.addOptions("table",table);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
+        String date=df.format(new Date());
+        vMap.put("secretary_record_date",date);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getGraduationDesignId());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+    }
+    protected boolean check() {
+        if(this.getGraduationDesignId()==null)
+            return false;
+        return true;
+    }
+    @Override
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
+
+    @Override
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
+    }
+
+    public void setvMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
+
+}

src/core/process/C_SecretaryFillReplyRecord.java

@@ -0,0 +1,51 @@
+package core.process;
+
+import core.operation.FillInformation;
+import error.GExcptInit;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class C_SecretaryFillReplyRecord extends TempProcess{
+
+    String graduationDesignId;
+    Map<String,String> vMap;
+
+    static  String table="graduation_design_reply_opinion_record_score";
+
+    public void fillInformation() throws Exception{
+        if(!check()) throw new GExcptInit("FillInformations Attrs Init error!");
+        FillInformation fillInformation=new FillInformation();
+        fillInformation.setOptions(new HashMap<>());
+        fillInformation.addOptions("table",table);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
+        String date=df.format(new Date());
+        vMap.put("secretary_record_date",date);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getGraduationDesignId());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+
+    }
+    protected boolean check() {
+        if(this.getGraduationDesignId()==null)
+            return false;
+        return true;
+    }
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
+    @Override
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
+    }
+
+    public void setvMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
+
+
+
+}

src/core/process/C_StudentFillGraduationDesignInformation.java

@@ -0,0 +1,47 @@
+package core.process;
+
+import core.operation.FillInformation;
+import error.GExcptInit;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class C_StudentFillGraduationDesignInformation extends TempProcess{
+    String graduationDesignId;
+    Map<String,String> vMap;
+
+    static  String table="graduation_design_opening_report_opinion_record";
+
+    public void fillInformation() throws Exception{
+        if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
+        FillInformation fillInformation=new FillInformation();
+        fillInformation.setOptions(new HashMap<>());
+        fillInformation.addOptions("table",table);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getGraduationDesignId());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+    }
+    protected boolean check() {
+        if(this.getGraduationDesignId()==null)
+            return false;
+        return true;
+    }
+    @Override
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
+
+    @Override
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
+    }
+
+    public void setvMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
+
+
+}

src/core/process/C_StudentUploadFinishedProduct.java

@@ -0,0 +1,48 @@
+package core.process;
+
+import core.operation.UploadFile;
+import error.GExcptInit;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+public class C_StudentUploadFinishedProduct {
+
+    File finishedProduct;
+    String gaduationDesignId;
+
+    static String file_type = "finished_product";
+    public void uploadOpeningReport() throws Exception{
+        if(!check()) throw new GExcptInit("Upload FinishedProduct Attrs init error!");
+        UploadFile uploadFile=new UploadFile();
+        uploadFile.setOptions(new HashMap<>());
+        uploadFile.addOptions("file",this.getFinishedProduct());
+        uploadFile.addOptions("file_type",file_type);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getGaduationDesignId());
+        uploadFile.addOptions("limits",limits);
+        uploadFile.execute(null);
+    }
+
+    protected boolean check() {
+        if(this.getFinishedProduct()==null||this.getGaduationDesignId()==null)
+            return false;
+        return true;
+    }
+    public File getFinishedProduct() {
+        return finishedProduct;
+    }
+
+    public void setFinishedProduct(File finishedProduct) {
+        this.finishedProduct = finishedProduct;
+    }
+    public String getGaduationDesignId() {
+        return gaduationDesignId;
+    }
+
+    public void setGaduationDesignId(String gaduationDesignId) {
+        this.gaduationDesignId = gaduationDesignId;
+    }
+
+}

src/core/process/C_StudentUploadOpeningReport.java

@@ -9,24 +9,24 @@ import java.util.Map;
 
 public class C_StudentUploadOpeningReport extends TempProcess{
     File openingReport;
-    String graduationDesignId;
+    String gaduationDesignId;
 
     static String file_type = "opening_report";
 
     public void uploadOpeningReport() throws Exception{
         if(!check()) throw new GExcptInit("Upload OpeningReport Attrs init error!");
-        UploadFile uploadFile=new UploadFile();
-        uploadFile.setOptions(new HashMap<>());
-        uploadFile.addOptions("file",this.getOpeningReport());
-        uploadFile.addOptions("file_type",file_type);
+        UploadFile uploadFileOperation=new UploadFile();
+        uploadFileOperation.setOptions(new HashMap<>());
+        uploadFileOperation.addOptions("file",this.getOpeningReport());
+        uploadFileOperation.addOptions("file_type",file_type);
         Map<String, String>limits = new HashMap<>();
-        limits.put("id",this.getGraduationDesignId());
-        uploadFile.addOptions("limits",limits);
-        uploadFile.execute(null);
+        limits.put("id",this.getGaduationDesignId());
+        uploadFileOperation.addOptions("limits",limits);
+        uploadFileOperation.execute(null);
     }
 
     protected boolean check() {
-        if(this.getGraduationDesignId()==null||this.getOpeningReport()==null)
+        if(this.getGaduationDesignId()==null||this.getOpeningReport()==null)
             return false;
         return true;
     }
@@ -39,11 +39,11 @@ public class C_StudentUploadOpeningReport extends TempProcess{
         this.openingReport = openingReport;
     }
 
-    public String getGraduationDesignId() {
-        return graduationDesignId;
+    public String getGaduationDesignId() {
+        return gaduationDesignId;
     }
 
-    public void setGraduationDesignId(String graduationDesignId) {
-        this.graduationDesignId = graduationDesignId;
+    public void setGaduationDesignId(String gaduationDesignId) {
+        this.gaduationDesignId = gaduationDesignId;
     }
 }

src/core/process/C_TeacherTeamFillOpeningReportOpinion.java

@@ -0,0 +1,50 @@
+package core.process;
+
+import core.operation.FillInformation;
+import error.GExcptInit;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class C_TeacherTeamFillOpeningReportOpinion extends TempProcess{
+
+    String graduationDesignId;
+    Map<String,String> vMap;
+
+    static  String table="graduation_design_opening_report_opinion_record";
+
+    public void fillInformation() throws Exception{
+        if(!check()) throw new GExcptInit("FillInformation Attrs init error!");
+        FillInformation fillInformation=new FillInformation();
+        fillInformation.setOptions(new HashMap<>());
+        fillInformation.addOptions("table",table);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
+        String date=df.format(new Date());
+        vMap.put("report_teacher_team_opinion_date",date);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getGraduationDesignId());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+    }
+    protected boolean check() {
+        if(this.getGraduationDesignId()==null)
+            return false;
+        return true;
+    }
+    @Override
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
+
+    @Override
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
+    }
+
+    public void setvMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
+
+}

src/core/process/C_TeacherTeamFillScoreOpinion.java

@@ -0,0 +1,49 @@
+package core.process;
+
+import core.operation.FillInformation;
+import error.GExcptInit;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+public class C_TeacherTeamFillScoreOpinion extends TempProcess {
+
+    String graduationDesignId;
+    Map<String,String> vMap;
+
+    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();
+        fillInformation.setOptions(new HashMap<>());
+        fillInformation.addOptions("table",table);
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-ddHH:mm:ss");
+        String date=df.format(new Date());
+        vMap.put("teacher_team_opinion_date",date);
+        Map<String, String>limits = new HashMap<>();
+        limits.put("id",this.getGraduationDesignId());
+        fillInformation.addOptions("limits",limits);
+        fillInformation.execute(null);
+    }
+    protected boolean check() {
+        if(this.getGraduationDesignId()==null)
+            return false;
+        return true;
+    }
+    @Override
+    public String getGraduationDesignId() {
+        return graduationDesignId;
+    }
+
+    @Override
+    public void setGraduationDesignId(String graduationDesignId) {
+        this.graduationDesignId = graduationDesignId;
+    }
+    public void setvMap(Map<String, String> vMap) {
+        this.vMap = vMap;
+    }
+
+}