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

jack
2 parents 8c1a7fba f4b16acc
Showing 2 changed files with 10 additions and 8 deletions
src/com/fh/controller/sunvote/report/ReportController.java
src/com/fh/controller/sunvote/student/StudentController.java
@@ -480,9 +480,12 @@ public class ReportController extends BaseController {
 					String n1 =  o1.getString("NUMBER");
 					String n2 =  o2.getString("NUMBER");
 					if(n1 != null && n2 != null){
-						Double d= Double.parseDouble(n1) - Double.parseDouble(n2);
-						
-						return Integer.valueOf(d.intValue());
+						try{
+							Double d= Double.parseDouble(n1) - Double.parseDouble(n2);
+							return Integer.valueOf(d.intValue());
+						}catch(Exception ex){
+							return 0;
+						}
 					}
 				}
 				return  o2score - o1score > 0 ? 1 : -1;
@@ -23,18 +23,17 @@ import org.springframework.web.servlet.ModelAndView;
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
+import com.fh.service.sunvote.classroster.ClassRosterManager;
+import com.fh.service.sunvote.student.StudentManager;
+import com.fh.service.sunvote.term.TermManager;
 import com.fh.util.AppUtil;
 import com.fh.util.Const;
 import com.fh.util.FileUpload;
+import com.fh.util.Jurisdiction;
 import com.fh.util.ObjectExcelRead;
 import com.fh.util.ObjectExcelView;
 import com.fh.util.PageData;
-import com.fh.util.Jurisdiction;
 import com.fh.util.PathUtil;
-import com.fh.util.Tools;
-import com.fh.service.sunvote.classroster.ClassRosterManager;
-import com.fh.service.sunvote.student.StudentManager;
-import com.fh.service.sunvote.term.TermManager;
 /** 
  * 说明：学生管理