chenrj-PC\chenrj 8 лет назад
Родитель
Сommit
012a55405b

+ 8 - 8
VisualInspection/js/statistics/assess_type.js

@@ -1,10 +1,10 @@
-        var lianyungang_Station = new Array;
-        var yancheng_Station = new Array;
-        var nantong_Station = new Array;
-        var r1 = new Array();
-        var r2 = new Array();
-        var r3 = new Array();
-        var rank = new Array();
+var lianyungang_Station = new Array;
+var yancheng_Station = new Array;
+var nantong_Station = new Array;
+var r1 = new Array();
+var r2 = new Array();
+var r3 = new Array();
+var rank = new Array();
 /**
 /**
  * 点击查询
  * 点击查询
  */
  */
@@ -300,7 +300,7 @@ function getItemScore(obj, check_item_name){
     var scores = obj.checked_score ;
     var scores = obj.checked_score ;
 
 
     for(var i=0;i<names.length ;i++){
     for(var i=0;i<names.length ;i++){
-        if( names[i].indexOf(check_item_name) > -1){
+        if( names[i]!=null && names[i].indexOf(check_item_name) > -1){
             return scores[i] ;
             return scores[i] ;
         }
         }
     }
     }

+ 3 - 1
VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/StatisticsController.java

@@ -127,7 +127,9 @@ public class StatisticsController extends BaseController {
     			Integer score = scoreTypeMap.get(names.get(i));
     			Integer score = scoreTypeMap.get(names.get(i));
     			if(score==null) score=0;
     			if(score==null) score=0;
     			score+=scores.get(i);
     			score+=scores.get(i);
-    			scoreTypeMap.put(names.get(i), score);
+    			if(names.get(i)!=null){
+    				scoreTypeMap.put(names.get(i), score);    				
+    			}
     		}
     		}
 //    		bean.get
 //    		bean.get
     	}
     	}