Commit f4b16acc37b72b5137358345437bafde0c187502
1 parent
437daa5a
修改学号排序问题
Showing
2 changed files
with
10 additions
and
8 deletions
src/com/fh/controller/sunvote/report/ReportController.java
| @@ -480,9 +480,12 @@ public class ReportController extends BaseController { | @@ -480,9 +480,12 @@ public class ReportController extends BaseController { | ||
| 480 | String n1 = o1.getString("NUMBER"); | 480 | String n1 = o1.getString("NUMBER"); |
| 481 | String n2 = o2.getString("NUMBER"); | 481 | String n2 = o2.getString("NUMBER"); |
| 482 | if(n1 != null && n2 != null){ | 482 | if(n1 != null && n2 != null){ |
| 483 | - Double d= Double.parseDouble(n1) - Double.parseDouble(n2); | ||
| 484 | - | ||
| 485 | - return Integer.valueOf(d.intValue()); | 483 | + try{ |
| 484 | + Double d= Double.parseDouble(n1) - Double.parseDouble(n2); | ||
| 485 | + return Integer.valueOf(d.intValue()); | ||
| 486 | + }catch(Exception ex){ | ||
| 487 | + return 0; | ||
| 488 | + } | ||
| 486 | } | 489 | } |
| 487 | } | 490 | } |
| 488 | return o2score - o1score > 0 ? 1 : -1; | 491 | return o2score - o1score > 0 ? 1 : -1; |
src/com/fh/controller/sunvote/student/StudentController.java
| @@ -23,18 +23,17 @@ import org.springframework.web.servlet.ModelAndView; | @@ -23,18 +23,17 @@ import org.springframework.web.servlet.ModelAndView; | ||
| 23 | 23 | ||
| 24 | import com.fh.controller.base.BaseController; | 24 | import com.fh.controller.base.BaseController; |
| 25 | import com.fh.entity.Page; | 25 | import com.fh.entity.Page; |
| 26 | +import com.fh.service.sunvote.classroster.ClassRosterManager; | ||
| 27 | +import com.fh.service.sunvote.student.StudentManager; | ||
| 28 | +import com.fh.service.sunvote.term.TermManager; | ||
| 26 | import com.fh.util.AppUtil; | 29 | import com.fh.util.AppUtil; |
| 27 | import com.fh.util.Const; | 30 | import com.fh.util.Const; |
| 28 | import com.fh.util.FileUpload; | 31 | import com.fh.util.FileUpload; |
| 32 | +import com.fh.util.Jurisdiction; | ||
| 29 | import com.fh.util.ObjectExcelRead; | 33 | import com.fh.util.ObjectExcelRead; |
| 30 | import com.fh.util.ObjectExcelView; | 34 | import com.fh.util.ObjectExcelView; |
| 31 | import com.fh.util.PageData; | 35 | import com.fh.util.PageData; |
| 32 | -import com.fh.util.Jurisdiction; | ||
| 33 | import com.fh.util.PathUtil; | 36 | import com.fh.util.PathUtil; |
| 34 | -import com.fh.util.Tools; | ||
| 35 | -import com.fh.service.sunvote.classroster.ClassRosterManager; | ||
| 36 | -import com.fh.service.sunvote.student.StudentManager; | ||
| 37 | -import com.fh.service.sunvote.term.TermManager; | ||
| 38 | 37 | ||
| 39 | /** | 38 | /** |
| 40 | * 说明:学生管理 | 39 | * 说明:学生管理 |