修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -2750,7 +2750,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             }
 
             long countGross = 0L;
+            long countGrossNoClean = 0L;
             long countTare = 0L;
+            long countTareNoClean = 0L;
             long countTermTare = 0L;
             long countNullWeightType = 0L;
             long countFirst = 0L;
@@ -2761,11 +2763,21 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
                         && !model.getValueFlag().equals("0")
                         && model.getWeightType().equals("0")).count();
+                //一次未结净净毛重
+                countGrossNoClean = carFirst.stream().filter(model -> StringUtils.isNotEmpty(model.getWeightType()) && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getValueFlag().equals("1")
+                        && model.getWeightType().equals("0")).count();
                 //一次皮重
                 countTare = carFirst.stream().filter(model -> StringUtils.isNotEmpty(model.getWeightType()) && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
                         && !model.getValueFlag().equals("0")
                         && model.getWeightType().equals("1")).count();
+                //一次未结净皮重
+                countTare = carFirst.stream().filter(model -> StringUtils.isNotEmpty(model.getWeightType()) && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getValueFlag().equals("1")
+                        && model.getWeightType().equals("1")).count();
                 //一次期限皮重
                 countTermTare = carFirst.stream().filter(model -> StringUtils.isNotEmpty(model.getWeightType()) && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
@@ -3015,9 +3027,11 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             obj.put("countUpload", countUpload);
             obj.put("countUnUpload", countUnUpload);
             obj.put("countActualValid", countActualValid);
-            //根据时间查询所有秤点的一次毛重、一次皮重、一次期限皮、一次有效、一次作废
+            //根据时间查询所有秤点的一次毛重、未洁净毛重、一次皮重、未结净皮重、一次期限皮、一次有效、一次作废
             obj.put("countGross", countGross);
+            obj.put("countGrossNoClean", countGrossNoClean);
             obj.put("countTare", countTare);
+            obj.put("countTareNoClean", countTareNoClean);
             obj.put("countTermTare", countTermTare);
             obj.put("countNullWeightType", countNullWeightType);
             obj.put("countFirst", countFirst);