孙向锦 / SunvoteEducation

Commit a975f494f0f1253ba2ad284fcf027830bd491d45

Authored by jack
2 parents 8c1a7fba f4b16acc

Merge branch '标准版' of http://120.78.57.84/Elvis/SunvoteEducation into 标准版

Inline Side-by-side
Showing 2 changed files with 10 additions and 8 deletions
src/com/fh/controller/sunvote/report/ReportController.java
  View file @a975f49
... ... @@ -480,9 +480,12 @@ public class ReportController extends BaseController {
480 480 String n1 = o1.getString("NUMBER");
481 481 String n2 = o2.getString("NUMBER");
482 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 491 return o2score - o1score > 0 ? 1 : -1;
... ...
src/com/fh/controller/sunvote/student/StudentController.java
  View file @a975f49
... ... @@ -23,18 +23,17 @@ import org.springframework.web.servlet.ModelAndView;
23 23  
24 24 import com.fh.controller.base.BaseController;
25 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 29 import com.fh.util.AppUtil;
27 30 import com.fh.util.Const;
28 31 import com.fh.util.FileUpload;
  32 +import com.fh.util.Jurisdiction;
29 33 import com.fh.util.ObjectExcelRead;
30 34 import com.fh.util.ObjectExcelView;
31 35 import com.fh.util.PageData;
32   -import com.fh.util.Jurisdiction;
33 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 * 说明：学生管理
... ...