Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/bean/count/MaterialCount.java

@@ -19,6 +19,16 @@ public class MaterialCount {
     private Integer offMGoodsNum = 0;
 
 
+    @ApiModelProperty("师傅辅材列表统计总配置数量")
+    private Integer allmWorkerGoodsNum = 0;
+
+    @ApiModelProperty("师傅辅材列表统计有效配置数量")
+    private Integer onmWorkerGoodsNum = 0;
+
+    @ApiModelProperty("师傅辅材列表统计无效配置数量")
+    private Integer offmWorkerGoodsNum = 0;
+
+
     @ApiModelProperty("辅材收费标准配置数量")
     private Integer allmChargeGoodsNum = 0;
 
@@ -29,16 +39,6 @@ public class MaterialCount {
     private Integer offmChargeGoodsNum = 0;
 
 
-    @ApiModelProperty("配件总配置数量")
-    private Integer allpGoodsNum = 0;
-
-    @ApiModelProperty("配件有效配置数量")
-    private Integer onPGoodsNum = 0;
-
-    @ApiModelProperty("配件无效配置数量")
-    private Integer offPGoodsNum = 0;
-
-
     @ApiModelProperty("供应商总配置数量")
     private Integer allVendNum = 0;
 
@@ -49,15 +49,74 @@ public class MaterialCount {
     private Integer offVendNum = 0;
 
 
+    @ApiModelProperty("产品关系维护单总数量")
+    private Integer allPNum = 0;
+
+    @ApiModelProperty("产品关系维护单保存数量")
+    private Integer savePNum = 0;
+
+    @ApiModelProperty("产品关系维护单已审批数量")
+    private Integer onPNum = 0;
+
+
+
+    @ApiModelProperty("网点采购单总数量")
+    private Integer websitCheckNum = 0;
+
+    @ApiModelProperty("网点采购单未核实数量")
+    private Integer websitCheckNeverNum = 0;
+
+    @ApiModelProperty("网点采购单已核实数量")
+    private Integer websitCheckYesNum = 0;
+
+
+    @ApiModelProperty("网点采购申请单保存数量")
+    private Integer websitApplySaveNum = 0;
+
+    @ApiModelProperty("网点采购申请单提交数量")
+    private Integer websitApplySumbitNum = 0;
+
+    @ApiModelProperty("网点采购申请单作废数量")
+    private Integer websitApplyCancelNum = 0;
+
+    @ApiModelProperty("网点采购申请单通过数量")
+    private Integer websitApplyOkNum = 0;
+
+    @ApiModelProperty("网点采购申请单失败数量")
+    private Integer websitApplyFailNum = 0;
+
+
+    @ApiModelProperty("网点采购订单保存数量")
+    private Integer websitOrderSaveNum = 0;
+
+    @ApiModelProperty("网点采购订单提交数量")
+    private Integer websitOrderSumbitNum = 0;
+
+    @ApiModelProperty("网点采购订单作废数量")
+    private Integer websitOrderCancelNum = 0;
+
+    @ApiModelProperty("网点采购订单通过数量")
+    private Integer websitOrderOkNum = 0;
 
-    @ApiModelProperty("辅材采购入库单保存数量")
-    private Integer savePurchaseNum = 0;
+    @ApiModelProperty("网点采购订单失败数量")
+    private Integer websitOrderFailNum = 0;
 
-    @ApiModelProperty("辅材采购入库单审核数量")
-    private Integer okPurchaseNum = 0;
 
-    @ApiModelProperty("辅材采购入库单审核失败数量")
-    private Integer failPurchaseNum = 0;
+
+    @ApiModelProperty("网点采购调整单保存数量")
+    private Integer websitAdjustmentSaveNum = 0;
+
+    @ApiModelProperty("网点采购调整单提交数量")
+    private Integer websitAdjustmentSumbitNum = 0;
+
+    @ApiModelProperty("网点采购调整单作废数量")
+    private Integer websitAdjustmentCancelNum = 0;
+
+    @ApiModelProperty("网点采购调整单通过数量")
+    private Integer websitAdjustmentOkNum = 0;
+
+    @ApiModelProperty("网点采购调整单失败数量")
+    private Integer websitAdjustmentFailNum = 0;
 
 
 
@@ -110,183 +169,17 @@ public class MaterialCount {
 
 
 
+    @ApiModelProperty("结算管理电子支付待结算")
+    private Integer settlementOrderWait = 0;
 
-    @ApiModelProperty("配件采购入库单保存数量")
-    private Integer savePurchasePNum = 0;
-
-    @ApiModelProperty("配件采购入库单审核数量")
-    private Integer okPurchasePNum = 0;
-
-    @ApiModelProperty("配件采购入库单审核失败数量")
-    private Integer failPurchasePNum = 0;
-
-
-
-    @ApiModelProperty("配件采购退货单保存数量")
-    private Integer savePurchaseRetPNum = 0;
-
-    @ApiModelProperty("配件采购退货单审核数量")
-    private Integer okPurchaseRetPNum = 0;
-
-    @ApiModelProperty("配件采购退货单审核失败数量")
-    private Integer failPurchaseRetPNum = 0;
-
-
-
-    @ApiModelProperty("配件销售订单保存数量")
-    private Integer saveSalesPNum = 0;
-
-    @ApiModelProperty("配件销售订单提交数量")
-    private Integer submitSalesPgNum = 0;
-
-    @ApiModelProperty("配件销售订单已支付未提货数量")
-    private Integer payNoTakeSalesPgNum = 0;
-
-    @ApiModelProperty("配件销售订单已支付已提货数量")
-    private Integer payTakeSalesPgNum = 0;
-
-    @ApiModelProperty("配件销售订单已取消数量")
-    private Integer cancelSalesPgNum = 0;
-
-
-    @ApiModelProperty("新件返还保存数量")
-    private Integer saveNewNum = 0;
-
-    @ApiModelProperty("新件返还提交数量")
-    private Integer submitNewNum = 0;
-
-    @ApiModelProperty("新件返还通过数量")
-    private Integer okNewNum = 0;
-
-
-    @ApiModelProperty("旧件返还保存数量")
-    private Integer saveOldNum = 0;
-
-    @ApiModelProperty("旧件返还提交数量")
-    private Integer submitOldNum = 0;
-
-    @ApiModelProperty("旧件返还通过数量")
-    private Integer okOldNum = 0;
-
-
-
-    @ApiModelProperty("旧件返厂保存数量")
-    private Integer saveOldFactoryNum = 0;
-
-    @ApiModelProperty("旧件返厂提交数量")
-    private Integer submitOldFactoryNum = 0;
-
-    @ApiModelProperty("旧件返厂通过数量")
-    private Integer okOldFactoryNum = 0;
-
-    @ApiModelProperty("旧件返厂失败数量")
-    private Integer failOldFactoryNum = 0;
-
-
-    @ApiModelProperty("微信支付待结算")
-    private Integer waitWechatNum = 0;
-
-    @ApiModelProperty("微信支付可提现")
-    private Integer waitingWechatNum = 0;
-
-    @ApiModelProperty("微信支付提现中")
-    private Integer ingWechatNum = 0;
-
-    @ApiModelProperty("微信支付已提现")
-    private Integer overWechatNum = 0;
-
-
-    @ApiModelProperty("微信支付待结算")
-    private Integer waitWechatNumOne = 0;
-
-    @ApiModelProperty("微信支付已完成")
-    private Integer okWechatNumOne = 0;
-
-    @ApiModelProperty("微信支付异常结算")
-    private Integer ycWechatNumOne = 0;
-
-    @ApiModelProperty("微信支付线下结算")
-    private Integer lineWechatNumOne = 0;
-
-
-
-
-    @ApiModelProperty("线下支付待结算")
-    private Integer waitWechatLineNum = 0;
-
-    @ApiModelProperty("线下支付已提现")
-    private Integer overWechatLineNum = 0;
-
-
-
-    @ApiModelProperty("工程配件部分付款")
-    private Integer waitSalesManagerPNum = 0;
-
-    @ApiModelProperty("工程配件未付款")
-    private Integer noSalesManagerPNum = 0;
-
-    @ApiModelProperty("工程配件已完成")
-    private Integer okSalesManagerPNum = 0;
-
-
-    @ApiModelProperty("工程辅材部分付款")
-    private Integer waitSalesManagerNum = 0;
-
-    @ApiModelProperty("工程辅材未付款")
-    private Integer noSalesManagerNum = 0;
-
-    @ApiModelProperty("工程辅材已完成")
-    private Integer okSalesManagerNum = 0;
-
-
-
-    @ApiModelProperty("辅材手工费待结算")
-    private Integer waitManualNum = 0;
-
-    @ApiModelProperty("辅材手工费已完成")
-    private Integer okManual = 0;
-
-
-    @ApiModelProperty("销售提现统计待发放")
-    private Integer waitWithdrawalNum = 0;
-
-    @ApiModelProperty("销售提现统计已发放")
-    private Integer okWithdrawalNum = 0;
-
-
-
-
-    @ApiModelProperty("工程辅材配件开单-辅材维护统计总配置数量")
-    private Integer allAloneNum = 0;
-
-    @ApiModelProperty("工程辅材配件开单-辅材维护统计有效配置数量")
-    private Integer onAloneNum = 0;
-
-    @ApiModelProperty("工程辅材配件开单-辅材维护统计无效配置数量")
-    private Integer offAloneNum = 0;
-
-
-    @ApiModelProperty("工程辅材配件开单-配件维护统计总配置数量")
-    private Integer allAlonePNum = 0;
-
-    @ApiModelProperty("工程辅材配件开单-配件维护统计有效配置数量")
-    private Integer onAlonePNum = 0;
-
-    @ApiModelProperty("工程辅材配件开单-配件维护统计无效配置数量")
-    private Integer offAlonePNum = 0;
-
-
-
-    @ApiModelProperty("工程辅材配件开单-收款统计待审核")
-    private Integer waitPayManagerNum = 0;
+    @ApiModelProperty("结算管理电子支付已完成")
+    private Integer settlementOrderOk = 0;
 
-    @ApiModelProperty("工程辅材配件开单-收款统计待收款")
-    private Integer waitPAYPayManagerNum = 0;
+    @ApiModelProperty("结算管理电子支付异常结算")
+    private Integer settlementOrderYc = 0;
 
-    @ApiModelProperty("工程辅材配件开单-收款统计部分收款")
-    private Integer partpayPayManagerNum = 0;
+    @ApiModelProperty("结算管理电子支付线下结算")
+    private Integer settlementOrderLine = 0;
 
-    @ApiModelProperty("工程辅材配件开单-收款统计收款完成")
-    private Integer payPayManagerNum = 0;
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/MaterialPeiJianCount.java

@@ -0,0 +1,145 @@
+package com.gree.mall.manager.bean.workorder;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class MaterialPeiJianCount {
+
+    @ApiModelProperty("配件资料总配置数量")
+    private Integer allpGoodsNum = 0;
+
+    @ApiModelProperty("配件资料有效配置数量")
+    private Integer onPGoodsNum = 0;
+
+    @ApiModelProperty("配件资料无效配置数量")
+    private Integer offPGoodsNum = 0;
+
+
+    @ApiModelProperty("配件新件入库总数量")
+    private Integer checkPNum = 0;
+
+    @ApiModelProperty("配件新件入库未验收数量")
+    private Integer checkNeverPNum = 0;
+
+    @ApiModelProperty("配件新件入库验收数量")
+    private Integer checkYesPNum = 0;
+
+
+    @ApiModelProperty("配件销售订单保存数量")
+    private Integer saveSalesPNum = 0;
+
+    @ApiModelProperty("配件销售订单提交数量")
+    private Integer submitSalesPgNum = 0;
+
+    @ApiModelProperty("配件销售订单已支付数量")
+    private Integer payNoTakeSalesPgNum = 0;
+
+    @ApiModelProperty("配件销售订单完成数量")
+    private Integer okTakeSalesPgNum = 0;
+
+    @ApiModelProperty("配件销售订单已取消数量")
+    private Integer cancelTakeSalesPgNum = 0;
+
+    @ApiModelProperty("配件销售订单异常数量")
+    private Integer ycSalesPgNum = 0;
+
+
+    @ApiModelProperty("新件返还保存数量")
+    private Integer bcNewNum = 0;
+
+    @ApiModelProperty("新件返还提交数量")
+    private Integer tjNewNum = 0;
+
+    @ApiModelProperty("新件返还驳回数量")
+    private Integer bhNewNum = 0;
+
+    @ApiModelProperty("新件返还通过数量")
+    private Integer tgNewNum = 0;
+
+    @ApiModelProperty("新件返还待复核数量")
+    private Integer dfhNewNum = 0;
+
+    @ApiModelProperty("新件返还已复核数量")
+    private Integer yfhkNewNum = 0;
+
+    @ApiModelProperty("新件返还未返还数量")
+    private Integer wwfhNewNum = 0;
+
+    @ApiModelProperty("新件返还已返还数量")
+    private Integer yyfhNewNum = 0;
+
+
+    @ApiModelProperty("旧件返还保存数量")
+    private Integer bcOldNum = 0;
+
+    @ApiModelProperty("旧件返还提交数量")
+    private Integer tjOldNum = 0;
+
+    @ApiModelProperty("旧件返还驳回数量")
+    private Integer bhOldNum = 0;
+
+    @ApiModelProperty("旧件返还通过数量")
+    private Integer tgOldNum = 0;
+
+    @ApiModelProperty("旧件返还待复核数量")
+    private Integer dfhOldNum = 0;
+
+    @ApiModelProperty("旧件返还已复核数量")
+    private Integer yfhkOldNum = 0;
+
+    @ApiModelProperty("旧件返还未返还数量")
+    private Integer wwfhOldNum = 0;
+
+    @ApiModelProperty("旧件返还已返还数量")
+    private Integer yyfhOldNum = 0;
+
+
+    @ApiModelProperty("新件转销售保存数量")
+    private Integer bcNewSaleNum = 0;
+
+    @ApiModelProperty("新件转销售提交数量")
+    private Integer tjNewSaleNum = 0;
+
+    @ApiModelProperty("新件转销售驳回数量")
+    private Integer bhNewSaleNum = 0;
+
+    @ApiModelProperty("新件转销售通过数量")
+    private Integer tgNewSaleNum = 0;
+
+    @ApiModelProperty("新件转销售待复核数量")
+    private Integer dfhNewSaleNum = 0;
+
+    @ApiModelProperty("新件转销售已复核数量")
+    private Integer yfhkNewSaleNum = 0;
+
+    @ApiModelProperty("新件转销售未返还数量")
+    private Integer wwfhNewSaleNum = 0;
+
+    @ApiModelProperty("新件转销售已返还数量")
+    private Integer yyfhNewSaleNum = 0;
+
+
+
+    @ApiModelProperty("保外新件转销售保存数量")
+    private Integer bcNewInnerNum = 0;
+
+    @ApiModelProperty("保外新件转销售提交数量")
+    private Integer tjNewInnerNum = 0;
+
+    @ApiModelProperty("保外新件转销售驳回数量")
+    private Integer bhNewInnerNum = 0;
+
+    @ApiModelProperty("保外新件转销售通过数量")
+    private Integer tgNewInnerNum = 0;
+
+    @ApiModelProperty("保外新件转销售待复核数量")
+    private Integer dfhNewInnerNum = 0;
+
+    @ApiModelProperty("保外新件转销售已复核数量")
+    private Integer yfhkNewInnerNum = 0;
+
+    @ApiModelProperty("保外新件转销售未返还数量")
+    private Integer wwfhNewInnerNum = 0;
+
+    @ApiModelProperty("保外新件转销售已返还数量")
+    private Integer yyfhNewInnerNum = 0;
+}

mall-server-api/src/main/java/com/gree/mall/manager/controller/count/DataCountController.java

@@ -3,6 +3,7 @@ package com.gree.mall.manager.controller.count;
 import com.gree.mall.manager.bean.count.IncreCount;
 import com.gree.mall.manager.bean.count.MaterialCount;
 import com.gree.mall.manager.bean.count.RepairProjectCount;
+import com.gree.mall.manager.bean.workorder.MaterialPeiJianCount;
 import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.count.CountLogic;
 import io.swagger.annotations.Api;
@@ -48,7 +49,7 @@ public class DataCountController {
 
 
     @GetMapping("/materialCount")
-    @ApiOperation(value = "辅材配件首页")
+    @ApiOperation(value = "辅材首页")
     public ResponseHelper<MaterialCount> materialCount(
 
             HttpServletRequest request) {
@@ -56,4 +57,14 @@ public class DataCountController {
         return ResponseHelper.success(materialCount);
     }
 
+
+    @GetMapping("/materialPeiJianCount")
+    @ApiOperation(value = "配件首页")
+    public ResponseHelper<MaterialPeiJianCount> MaterialPeiJianCount(
+
+            HttpServletRequest request) {
+        MaterialCount materialCount = countLogic.MaterialPeiJianCount(request);
+        return ResponseHelper.success(materialCount);
+    }
+
 }

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

@@ -494,22 +494,6 @@ public class CountLogic {
         );
 
 
-        materialCount.setAllpGoodsNum(
-                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())
-                ).count())
-        );
-
-        materialCount.setOnPGoodsNum(
-                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())
-                        && item.getStatus().equals(StateEnum.ON.getKey())
-                ).count())
-        );
-
-        materialCount.setOffPGoodsNum(
-                Convert.toInt(websitGoods.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())
-                        && item.getStatus().equals(StateEnum.OFF.getKey())
-                ).count())
-        );
 
 
         List<WebsitVender> websitVenders = websitVenderService.lambdaQuery()
@@ -532,89 +516,6 @@ public class CountLogic {
                 ).count())
         );
 
-        List<WebsitPurchase> websitPurchases = websitPurchaseService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPurchase::getWebsitId, adminUser.getAdminWebsitIds())
-                .select(WebsitPurchase::getFlag, WebsitPurchase::getPurchaseId,WebsitPurchase::getGoodsType).list();
-
-        materialCount.setSavePurchaseNum(
-                Convert.toInt(websitPurchases.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())
-                ).count())
-        );
-
-        materialCount.setOkPurchaseNum(
-                Convert.toInt(websitPurchases.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.OK.getKey())
-                ).count())
-        );
-
-        materialCount.setFailPurchaseNum(
-                Convert.toInt(websitPurchases.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
-                ).count())
-        );
-
-
-
-        materialCount.setSavePurchasePNum(
-                Convert.toInt(websitPurchases.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())
-                ).count())
-        );
-
-        materialCount.setOkPurchasePNum(
-                Convert.toInt(websitPurchases.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.OK.getKey())
-                ).count())
-        );
-
-        materialCount.setFailPurchasePNum(
-                Convert.toInt(websitPurchases.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
-                ).count())
-        );
-
-
-        List<WebsitPurchaseRet> websitPurchaseRets = websitPurchaseRetService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPurchaseRet::getWebsitId, adminUser.getAdminWebsitIds())
-                .select(WebsitPurchaseRet::getFlag, WebsitPurchaseRet::getPurchaseId, WebsitPurchaseRet::getGoodsType).list();
-
-
-        materialCount.setSavePurchaseRetNum(
-                Convert.toInt(websitPurchaseRets.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())
-                ).count())
-        );
-
-        materialCount.setOkPurchaseRetNum(
-                Convert.toInt(websitPurchaseRets.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.OK.getKey())
-                ).count())
-        );
-
-        materialCount.setFailPurchaseRetNum(
-                Convert.toInt(websitPurchaseRets.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
-                ).count())
-        );
-
-        materialCount.setSavePurchaseRetPNum(
-                Convert.toInt(websitPurchaseRets.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())
-                ).count())
-        );
-
-        materialCount.setOkPurchaseRetPNum(
-                Convert.toInt(websitPurchaseRets.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.OK.getKey())
-                ).count())
-        );
-
-        materialCount.setFailPurchaseRetPNum(
-                Convert.toInt(websitPurchaseRets.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
-                ).count())
-        );
 
         List<WebsitPriceUpd> websitPriceUpds = websitPriceUpdService.lambdaQuery()
                 .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPriceUpd::getWebsitId, adminUser.getAdminWebsitIds())
@@ -670,37 +571,6 @@ public class CountLogic {
         );
 
 
-        materialCount.setSaveSalesPNum(
-                Convert.toInt(websitSales.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())
-                ).count())
-        );
-
-
-        materialCount.setSubmitSalesPgNum(
-                Convert.toInt(websitSales.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SUBMIT.getKey())
-                ).count())
-        );
-
-        materialCount.setPayNoTakeSalesPgNum(
-                Convert.toInt(websitSales.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(MaterialSalesFlagEnum.PAY_NOT_TAKE.getKey())
-                ).count())
-        );
-
-        materialCount.setPayTakeSalesPgNum(
-                Convert.toInt(websitSales.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(MaterialSalesFlagEnum.PAY_TAKE.getKey())
-                ).count())
-        );
-
-        materialCount.setCancelSalesPgNum(
-                Convert.toInt(websitSales.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getFlag().equals(MaterialSalesFlagEnum.CANCEL.getKey())
-                ).count())
-        );
-
         List<WebsitSalesRet> websitSalesRets = websitSalesRetService.lambdaQuery()
                 .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitSalesRet::getWebsitId, adminUser.getAdminWebsitIds())
                 .select(WebsitSalesRet::getRetState, WebsitSalesRet::getSalesId, WebsitSalesRet::getGoodsType).list();
@@ -736,281 +606,11 @@ public class CountLogic {
                 .select(WebsitPartsRet::getFlag, WebsitPartsRet::getPartsRetId, WebsitPartsRet::getGoodsType,WebsitPartsRet::getType).list();
 
 
-        materialCount.setSaveNewNum(
-                Convert.toInt(websitPartsRets.stream().filter(item -> item.getType().equals(PartsAttrEnum.NEW.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())
-                ).count())
-        );
-
-        materialCount.setSubmitNewNum(
-                Convert.toInt(websitPartsRets.stream().filter(item -> item.getType().equals(PartsAttrEnum.NEW.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SUBMIT.getKey())
-                ).count())
-        );
-
-        materialCount.setOkNewNum(
-                Convert.toInt(websitPartsRets.stream().filter(item -> item.getType().equals(PartsAttrEnum.NEW.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.OK.getKey())
-                ).count())
-        );
-
-        materialCount.setSaveOldNum(
-                Convert.toInt(websitPartsRets.stream().filter(item -> item.getType().equals(PartsAttrEnum.OLD.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())
-                ).count())
-        );
-
-        materialCount.setSubmitOldNum(
-                Convert.toInt(websitPartsRets.stream().filter(item -> item.getType().equals(PartsAttrEnum.OLD.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SUBMIT.getKey())
-                ).count())
-        );
-
-        materialCount.setOkOldNum(
-                Convert.toInt(websitPartsRets.stream().filter(item -> item.getType().equals(PartsAttrEnum.OLD.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.OK.getKey())
-                ).count())
-        );
-
-
-        materialCount.setOkOldFactoryNum(
-                Convert.toInt(websitPartsRets.stream().filter(item -> item.getType().equals(PartsAttrEnum.FACTORY.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.OK.getKey())
-                ).count())
-        );
-
-        materialCount.setSaveOldFactoryNum(
-                Convert.toInt(websitPartsRets.stream().filter(item -> item.getType().equals(PartsAttrEnum.FACTORY.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SAVE.getKey())
-                ).count())
-        );
-
-        materialCount.setSubmitOldFactoryNum(
-                Convert.toInt(websitPartsRets.stream().filter(item -> item.getType().equals(PartsAttrEnum.FACTORY.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.SUBMIT.getKey())
-                ).count())
-        );
-
-        materialCount.setFailOldFactoryNum(
-                Convert.toInt(websitPartsRets.stream().filter(item -> item.getType().equals(PartsAttrEnum.FACTORY.getKey()) &&
-                        item.getFlag().equals(ExamineStatusEnum.FAIL.getKey())
-                ).count())
-        );
-
-        List<SettlementOrder> settlementOrders = settlementOrderService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), SettlementOrder::getWebsitId, adminUser.getAdminWebsitIds())
-                .select(SettlementOrder::getStatus, SettlementOrder::getPayStatus, SettlementOrder::getSettlementOrderId, SettlementOrder::getPayType).list();
-        materialCount.setWaitWechatNumOne(
-                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
-                        item.getStatus().equals(ExamineStatusEnum.WAIT.getKey())
-                ).count())
-        );
-
-        materialCount.setOkWechatNumOne(
-                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
-                        item.getStatus().equals(SettlementStatusNewEnum.OK.getKey())
-                ).count())
-        );
-
-        materialCount.setYcWechatNumOne(
-                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
-                        item.getStatus().equals(SettlementStatusNewEnum.YC.getKey())
-                ).count())
-        );
-
-        materialCount.setLineWechatNumOne(
-                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
-                        item.getStatus().equals(SettlementStatusNewEnum.LINE.getKey())
-                ).count())
-        );
-
-
-
-
-
-        materialCount.setWaitWechatNum(
-                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
-                        item.getStatus().equals(ExamineStatusEnum.WAIT.getKey())
-                ).count())
-        );
-
-        materialCount.setWaitingWechatNum(
-                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
-                        item.getStatus().equals(SettlementStatusEnum.WAIT_ING.getKey())
-                ).count())
-        );
-
-        materialCount.setIngWechatNum(
-                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
-                        item.getStatus().equals(SettlementStatusEnum.ING.getKey())
-                ).count())
-        );
-
-        materialCount.setOverWechatNum(
-                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.WECHAT.getKey()) &&
-                        item.getStatus().equals(SettlementStatusEnum.OVER.getKey())
-                ).count())
-        );
-
-        materialCount.setWaitWechatLineNum(
-                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.LINE.getKey()) &&
-                        item.getStatus().equals(SettlementStatusEnum.WAIT.getKey())
-                ).count())
-        );
-
-        materialCount.setOverWechatLineNum(
-                Convert.toInt(settlementOrders.stream().filter(item -> item.getPayType().equals(PayTypeEnum.LINE.getKey()) &&
-                        item.getStatus().equals(SettlementStatusEnum.OVER.getKey())
-                ).count())
-        );
-
-        List<WebsitSalesManager> websitSalesManagers = websitSalesManagerService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getCompanyWechatIds()), WebsitSalesManager::getCompanyWechatId, adminUser.getCompanyWechatIds())
-                .select(WebsitSalesManager::getStatus, WebsitSalesManager::getWebsitSalesManagerId, WebsitSalesManager::getGoodsType).list();
-
-        materialCount.setWaitSalesManagerPNum(
-                Convert.toInt(websitSalesManagers.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getStatus().equals(SettlementStatusEnum.WAIT.getKey())
-                ).count())
-        );
-
-        materialCount.setNoSalesManagerPNum(
-                Convert.toInt(websitSalesManagers.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getStatus().equals(ExamineStatusManagerEnum.NO.getKey())
-                ).count())
-        );
-
-        materialCount.setOkSalesManagerPNum(
-                Convert.toInt(websitSalesManagers.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getStatus().equals(ExamineStatusManagerEnum.OK.getKey())
-                ).count())
-        );
-
-        materialCount.setWaitSalesManagerNum(
-                Convert.toInt(websitSalesManagers.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getStatus().equals(SettlementStatusEnum.WAIT.getKey())
-                ).count())
-        );
-
-        materialCount.setNoSalesManagerNum(
-                Convert.toInt(websitSalesManagers.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getStatus().equals(ExamineStatusManagerEnum.NO.getKey())
-                ).count())
-        );
-
-        materialCount.setOkSalesManagerNum(
-                Convert.toInt(websitSalesManagers.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getStatus().equals(ExamineStatusManagerEnum.OK.getKey())
-                ).count())
-        );
-
-        List<SettlementOrderManual> settlementOrderManuals = settlementOrderManualService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), SettlementOrderManual::getWebsitId, adminUser.getAdminWebsitIds())
-                .select(SettlementOrderManual::getStatus, SettlementOrderManual::getSettlementOrderId, SettlementOrderManual::getGoodsType).list();
-
-
-        materialCount.setWaitManualNum(
-                Convert.toInt(settlementOrderManuals.stream().filter(item ->
-                        item.getStatus().equals(ExamineStatusManagerEnum.WAIT.getKey())
-                ).count())
-        );
-
-        materialCount.setOkManual(
-                Convert.toInt(settlementOrderManuals.stream().filter(item ->
-                        item.getStatus().equals(SettlementStatusEnum.OVER.getKey())
-                ).count())
-        );
-
-        List<WithdrawalOrder> withdrawalOrders = withdrawalOrderService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getCompanyWechatIds()), WithdrawalOrder::getCompanyWechatId, adminUser.getCompanyWechatIds())
-                .select(WithdrawalOrder::getStatus, WithdrawalOrder::getId).list();
-
-        materialCount.setWaitWithdrawalNum(
-                Convert.toInt(withdrawalOrders.stream().filter(item ->
-                        item.getStatus().equals(0)
-                ).count())
-        );
-
-        materialCount.setOkWithdrawalNum(
-                Convert.toInt(withdrawalOrders.stream().filter(item ->
-                        item.getStatus().equals(1)
-                ).count())
-        );
-
-        List<WebsitGoodsAlone> websitGoodsAlones = websitGoodsAloneService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getCompanyWechatIds()), WebsitGoodsAlone::getCompanyWechatId, adminUser.getCompanyWechatIds())
-                .select(WebsitGoodsAlone::getGoodsId, WebsitGoodsAlone::getGoodsType, WebsitGoodsAlone::getStatus).list();
-
-        materialCount.setAllAloneNum(
-                Convert.toInt(websitGoodsAlones.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey())
-                ).count())
-        );
-
-        materialCount.setOnAloneNum(
-                Convert.toInt(websitGoodsAlones.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getStatus().equals(StateEnum.ON.getKey())
-
-                ).count())
-        );
-
-        materialCount.setOffAloneNum(
-                Convert.toInt(websitGoodsAlones.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.M.getKey()) &&
-                        item.getStatus().equals(StateEnum.OFF.getKey())
-
-                ).count())
-        );
-
-        materialCount.setAllAlonePNum(
-                Convert.toInt(websitGoodsAlones.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())
-                ).count())
-        );
-
-        materialCount.setOnAlonePNum(
-                Convert.toInt(websitGoodsAlones.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getStatus().equals(StateEnum.ON.getKey())
-
-                ).count())
-        );
-
-        materialCount.setOffAlonePNum(
-                Convert.toInt(websitGoodsAlones.stream().filter(item -> item.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey()) &&
-                        item.getStatus().equals(StateEnum.OFF.getKey())
-
-                ).count())
-        );
-
-        List<EnginPayManage> enginPayManages = enginPayManageService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), EnginPayManage::getWebsitId, adminUser.getAdminWebsitIds())
-                .select(EnginPayManage::getId, EnginPayManage::getGoodsType, EnginPayManage::getStatus).list();
-
-        materialCount.setWaitPayManagerNum(
-                Convert.toInt(enginPayManages.stream().filter(item ->
-                        item.getStatus().equals(ExamineStatusEnum.WAIT.getKey())
-
-                ).count())
-        );
-
-        materialCount.setWaitPAYPayManagerNum(
-                Convert.toInt(enginPayManages.stream().filter(item ->
-                        item.getStatus().equals(EnginPayManageStatusEnum.WAIT_PAY.getKey())
-
-                ).count())
-        );
-
-        materialCount.setPartpayPayManagerNum(
-                Convert.toInt(enginPayManages.stream().filter(item ->
-                        item.getStatus().equals(EnginPayManageStatusEnum.PART_PAY.getKey())
-
-                ).count())
-        );
+        return materialCount;
+    }
 
-        materialCount.setPayPayManagerNum(
-                Convert.toInt(enginPayManages.stream().filter(item ->
-                        item.getStatus().equals(EnginPayManageStatusEnum.PAY.getKey())
+    public MaterialCount MaterialPeiJianCount(HttpServletRequest request) {
 
-                ).count())
-        );
-
-        return materialCount;
+        return new MaterialCount();
     }
 }