'commit'

Doc/数据上报系统测试账号.txt

@@ -11,7 +11,6 @@ DsideaL4r5t6y7u
 丁虹元 dinghongyuan 123456
 
 校办干事 
-长春市第二中学干事       liudehua 123456
 长春市第二十中学干事      eszgs   123456
 长春市第一实验东光学校干事 dggs   123456
 长春市第八中学干事        bzgs   123456

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -947,7 +947,7 @@ public class CollectModel {
      * @return
      */
     public List<Record> getSchoolNjList(String school_id) {
-        String sql = "select distinct stage_id,entry_year from t_base_class  where bureau_id=? and b_use=1";
+        String sql = "select distinct stage_id,entry_year from t_base_class  where bureau_id=? and b_use=1 order by stage_id,entry_year";
         List<Record> list = Db.find(sql, school_id);
 
         int currentXn = getCurrentXn();