‘linchangsheng’ vor 7 Monaten
Ursprung
Commit
0ddf7cfe2c

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

@@ -614,15 +614,20 @@ public class CountLogic {
         );
 
 
+        List<String> flagsApply = new ArrayList<>();
+        flagsApply.add(ExamineStatusEnum.SUBMIT.getKey());
+        flagsApply.add(ExamineStatusEnum.SAVE.getKey());
+
+
         materialCount.setWebsitApplySaveNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
-                        flags.contains(item.getFlag()) &&
+                        flagsApply.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())).count())
         );
 
         materialCount.setWebsitApplySumbitNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
-                        flags.contains(item.getFlag()) &&
+                        flagsApply.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                                 && item.getFlag().equals(ExamineStatusEnum.SUBMIT.getKey())
                 ).count())
@@ -632,7 +637,7 @@ public class CountLogic {
 
         materialCount.setWebsitApplyCancelNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
-                        flags.contains(item.getFlag()) &&
+                        flagsApply.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                                 && item.getFlag().equals(PartsOrderStatusEnum.CANCEL.getKey())
                 ).count())
@@ -640,7 +645,7 @@ public class CountLogic {
 
         materialCount.setWebsitApplyOkNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
-                        flags.contains(item.getFlag()) &&
+                        flagsApply.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                         && item.getFlag().equals(ExamineStatusEnum.OK.getKey())
                 ).count())
@@ -649,7 +654,7 @@ public class CountLogic {
 
         materialCount.setWebsitApplyFailNum(
                 Convert.toInt(websitPurchaseList.stream().filter(item ->
-                        flags.contains(item.getFlag()) &&
+                        flagsApply.contains(item.getFlag()) &&
                         item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
                                 && item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
                 ).count())