温红权 8 лет назад
Родитель
Сommit
ded3d48609

+ 12 - 8
VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -498,14 +498,18 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 	}
 
 	private Integer getItemScore2(StatisticsBean obj, String name) {
-		List<String> names = obj.getChecked_socre_name();
-		List<Integer> scores = obj.getChecked_score();
-		for (int i = 0; i < names.size(); i++) {
-			if (names.get(i).indexOf(name) > -1) {
-				return scores.get(i);
-			}
-		}
-		return 0;
+
+            List<String> names = obj.getChecked_socre_name();
+            List<Integer> scores = obj.getChecked_score();
+            for (int i = 0; i < names.size(); i++) {
+                if(names.get(i)==null) continue;
+                if (names.get(i).indexOf(name) > -1) {
+                    return scores.get(i);
+                }
+            }
+            return 0;
+
+
 	}
 
 	@Override

BIN
VisualInspection_server/src/main/resources/checked_item_info.xls