Merge branch 'master' of http://git.picaiba.com/CaiXiang/SPC

ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java

@@ -158,7 +158,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
             //分组样本数 = 样本大小 = 检验特性分组数的最大值
             //Integer numbersOfSamples = inspectionSheetFeaturesList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize();
             //过滤计量型特性
-            List<ProductFeaturesDTO> featuresList = inspectionSheetFeaturesList.stream().filter(s->s.getType()==1).collect(Collectors.toList());
+            List<ProductFeaturesDTO> featuresList = inspectionSheetFeaturesList.stream().filter(s-> s.getSampleSize()!=null && s.getType()==1).collect(Collectors.toList());
             if(featuresList != null && featuresList.size() != 0) {
                 Integer numbersOfSamples = featuresList.stream().max(Comparator.comparing(ProductFeaturesDTO::getSampleSize)).get().getSampleSize();
                 if (numbersOfSamples != null) {
@@ -373,7 +373,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
                         }
                         if (feature.getType() == 2) {
                             Double featureValue = Double.valueOf(argValue);
-                            if (featureValue == 1) {
+                            if (featureValue == 0) {
                                 eventDefects = eventDefects + 1;
                             }
                         }
@@ -468,7 +468,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
         QueryDataParam queryDataParam = new QueryDataParam();
         queryDataParam.setMeasurement(workingProcedureName);
         queryDataParam.setBucket("qgs-bucket");
-        queryDataParam.setTags(Arrays.asList(new Tag("inspectionSheetId", inspectionSheetId.toString())));
+        queryDataParam.setTags(Arrays.asList(new Tag("inspectionSheetId", inspectionSheetId)));
         List<String> dropNames = new ArrayList<>();
         dropNames.add("transationId");
         queryDataParam.setDropedTagNames(dropNames);