需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/count/CountLogic.java

@@ -601,25 +601,28 @@ public class CountLogic {
 
         materialCount.setWebsitCheckNeverNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
-                        flags.contains(item.getFlag()) &&
-                        item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
+                        flags.contains(item.getFlag())
+
                 ).count())
         );
 
         materialCount.setWebsitCheckYesNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
-                        flags.contains(item.getFlag()) &&
-                        item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
+                        flags.contains(item.getFlag())
+
                 ).count())
         );
 
 
         materialCount.setWebsitApplySaveNum(
-                Convert.toInt(websitPurchaseList.stream().filter(item -> item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())).count())
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flags.contains(item.getFlag()) &&
+                        item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())).count())
         );
 
         materialCount.setWebsitApplySumbitNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flags.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                                 && item.getFlag().equals(ExamineStatusEnum.SUBMIT.getKey())
                 ).count())
@@ -629,6 +632,7 @@ public class CountLogic {
 
         materialCount.setWebsitApplyCancelNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flags.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                                 && item.getFlag().equals(PartsOrderStatusEnum.CANCEL.getKey())
                 ).count())
@@ -636,6 +640,7 @@ public class CountLogic {
 
         materialCount.setWebsitApplyOkNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flags.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                         && item.getFlag().equals(ExamineStatusEnum.OK.getKey())
                 ).count())
@@ -644,6 +649,7 @@ public class CountLogic {
 
         materialCount.setWebsitApplyFailNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        flags.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                                 && item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
                 ).count())