zhailw
/
gdms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/core/operation/Search.json
wlf
wan 7 years ago
parent 3cbe7c42d8
commit dfcd434b07
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File

60
.idea/dataSources/356b1cbb-8e8d-401f-bdfc-b3e917bc8301.xml
Unescape View File

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

1
src/core/process/C_StudentSearchTeacher.java
Unescape View File

@ -29,5 +29,4 @@ public class C_StudentSearchTeacher {
TeacherInfo.put("name",s[2]); TeacherInfo.put("name",s[2]);
return TeacherInfo; return TeacherInfo;
} }
} }

Write Preview
Loading…
Cancel
Save