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

# Conflicts:
#	.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
#	src/core/operation/Select.json
#	src/core/process/Process.java

.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml

@@ -1738,77 +1738,77 @@
       <DataType>char(1)|0s</DataType>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="420" parent="337" name="opening_report_mentor_opinion_status">
-      <Position>9</Position>
-      <DataType>char(1)|0s</DataType>
-      <ColumnKind>normal</ColumnKind>
-    </column>
-    <column id="421" parent="337" name="opening_report_teacher_team_opinion_status">
-      <Position>10</Position>
-      <DataType>char(1)|0s</DataType>
-      <ColumnKind>normal</ColumnKind>
-    </column>
-    <column id="422" parent="337" name="opening_report_college_opinion_status">
-      <Position>11</Position>
-      <DataType>char(1)|0s</DataType>
-      <ColumnKind>normal</ColumnKind>
-    </column>
-    <column id="423" parent="337" name="opening_report_secretary_record_status">
-      <Position>12</Position>
-      <DataType>char(1)|0s</DataType>
-      <ColumnKind>normal</ColumnKind>
-    </column>
-    <key id="424" parent="337" name="PRIMARY">
+    <key id="420" parent="337" name="PRIMARY">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="425" parent="338" name="id">
+    <column id="421" parent="338" name="id">
       <Position>1</Position>
       <DataType>char(20)|0s</DataType>
       <NotNull>1</NotNull>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="426" parent="338" name="mentor_opinion">
+    <column id="422" parent="338" name="mentor_opinion">
       <Position>2</Position>
       <DataType>text|0s</DataType>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="427" parent="338" name="mentor_opinion_date">
+    <column id="423" parent="338" name="mentor_opinion_date">
       <Position>3</Position>
       <DataType>date|0s</DataType>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="428" parent="338" name="secretary_record">
+    <column id="424" parent="338" name="secretary_record">
       <Position>4</Position>
       <DataType>text|0s</DataType>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="429" parent="338" name="secretary_record_date">
+    <column id="425" parent="338" name="secretary_record_date">
       <Position>5</Position>
       <DataType>date|0s</DataType>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="430" parent="338" name="report_teacher_team_opinion">
+    <column id="426" parent="338" name="report_teacher_team_opinion">
       <Position>6</Position>
       <DataType>text|0s</DataType>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="431" parent="338" name="report_teacher_team_opinion_date">
+    <column id="427" parent="338" name="report_teacher_team_opinion_date">
       <Position>7</Position>
       <DataType>date|0s</DataType>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="432" parent="338" name="college_opinion">
+    <column id="428" parent="338" name="college_opinion">
       <Position>8</Position>
       <DataType>text|0s</DataType>
       <ColumnKind>normal</ColumnKind>
     </column>
-    <column id="433" parent="338" name="college_opinion_date">
+    <column id="429" parent="338" name="college_opinion_date">
       <Position>9</Position>
       <DataType>date|0s</DataType>
       <ColumnKind>normal</ColumnKind>
     </column>
+    <column id="430" parent="338" name="opening_report_mentor_opinion_status">
+      <Position>10</Position>
+      <DataType>char(1)|0s</DataType>
+      <ColumnKind>normal</ColumnKind>
+    </column>
+    <column id="431" parent="338" name="opening_report_teacher_team_opinion_status">
+      <Position>11</Position>
+      <DataType>char(1)|0s</DataType>
+      <ColumnKind>normal</ColumnKind>
+    </column>
+    <column id="432" parent="338" name="opening_report_college_opinion_status">
+      <Position>12</Position>
+      <DataType>char(1)|0s</DataType>
+      <ColumnKind>normal</ColumnKind>
+    </column>
+    <column id="433" parent="338" name="opening_report_secretary_record_status">
+      <Position>13</Position>
+      <DataType>char(1)|0s</DataType>
+      <ColumnKind>normal</ColumnKind>
+    </column>
     <key id="434" parent="338" name="PRIMARY">
       <NameSurrogate>1</NameSurrogate>
       <ColNames>id</ColNames>

.idea/dictionaries/zhai_.xml

@@ -3,6 +3,7 @@
     <words>
       <w>excpt</w>
       <w>gdms</w>
+      <w>hmmss</w>
       <w>mariadb</w>
       <w>synchronizable</w>
     </words>

.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="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="10" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

src/core/process/LastProcess.java

@@ -0,0 +1,4 @@
+package core.process;
+
+public abstract class LastProcess extends Process {
+}

src/core/process/Process.java

@@ -2,17 +2,14 @@ package core.process;
 
 import core.operation.Operation;
 
-public abstract class Process implements Cloneable{
+public abstract class Process{
+
+    private char status;
 
     private String permission;
     private Operation operation;
     private String buttonName;
     private String info;
-    @Override
-    public Process clone(){
-        //todo
-        return null;
-    }
 
     public String getPermission() {
         return permission;
@@ -45,4 +42,12 @@ public abstract class Process implements Cloneable{
     public void setInfo(String info) {
         this.info = info;
     }
+
+    public char getStatus() {
+        return status;
+    }
+
+    public void setStatus(char status) {
+        this.status = status;
+    }
 }

src/core/process/ProcessManagement.java

@@ -5,5 +5,7 @@ public class ProcessManagement {
     public Condition getCondition(String userType, List<Integer> index){
         return null;
     }
-
+    public Process getProcess(int index){
+        return null;
+    }
 }

src/core/process/TempProcess.java

@@ -0,0 +1,22 @@
+package core.process;
+
+public abstract class TempProcess extends Process {
+    public static String process;
+    public static String nextProcess;
+
+    public static String getProcess() {
+        return process;
+    }
+
+    public static void setProcess(String process) {
+        TempProcess.process = process;
+    }
+
+    public static String getNextProcess() {
+        return nextProcess;
+    }
+
+    public static void setNextProcess(String nextProcess) {
+        TempProcess.nextProcess = nextProcess;
+    }
+}

src/gdms/test.java

@@ -19,5 +19,11 @@ public class test {
         Select sql = new Select(list,"zx",map,1,2);
         System.out.println(sql.getSQL());
         System.out.println(Utils.getFilePathName("a","b"));
+        String a = "a";
+        changeB(a);
+        System.out.println(a);
+    }
+    static void changeB(String a){
+        a="B";
     }
 }