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

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

@@ -19,16 +19,6 @@ 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;
 
@@ -49,6 +39,16 @@ public class MaterialCount {
     private Integer offVendNum = 0;
 
 
+    @ApiModelProperty("师傅辅材列表统计总配置数量")
+    private Integer allmWorkerGoodsNum = 0;
+
+    @ApiModelProperty("师傅辅材列表统计有效配置数量")
+    private Integer onmWorkerGoodsNum = 0;
+
+    @ApiModelProperty("师傅辅材列表统计无效配置数量")
+    private Integer offmWorkerGoodsNum = 0;
+
+
     @ApiModelProperty("产品关系维护单总数量")
     private Integer allPNum = 0;
 
@@ -58,8 +58,6 @@ public class MaterialCount {
     @ApiModelProperty("产品关系维护单已审批数量")
     private Integer onPNum = 0;
 
-
-
     @ApiModelProperty("网点采购单总数量")
     private Integer websitCheckNum = 0;
 

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

@@ -1,7 +1,11 @@
 package com.gree.mall.manager.bean.workorder;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+@ApiModel
+@Data
 public class MaterialPeiJianCount {
 
     @ApiModelProperty("配件资料总配置数量")

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

@@ -63,7 +63,7 @@ public class DataCountController {
     public ResponseHelper<MaterialPeiJianCount> MaterialPeiJianCount(
 
             HttpServletRequest request) {
-        MaterialCount materialCount = countLogic.MaterialPeiJianCount(request);
+        MaterialPeiJianCount materialCount = countLogic.MaterialPeiJianCount(request);
         return ResponseHelper.success(materialCount);
     }
 

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

@@ -7,6 +7,7 @@ import cn.hutool.core.io.unit.DataUnit;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.count.*;
+import com.gree.mall.manager.bean.workorder.MaterialPeiJianCount;
 import com.gree.mall.manager.commonmapper.CountMapper;
 import com.gree.mall.manager.enums.*;
 import com.gree.mall.manager.enums.engin.EnginPayManageStatusEnum;
@@ -109,6 +110,12 @@ public class CountLogic {
     @Autowired
     EnginPayManageService enginPayManageService;
 
+    @Autowired
+    WorkerGoodsService workerGoodsService;
+
+    @Autowired
+    WebsitVenderGoodsService websitVenderGoodsService;
+
     /**
      * 概况统计
      */
@@ -517,6 +524,71 @@ public class CountLogic {
         );
 
 
+        List<WorkerGoods> workerGoodsList = workerGoodsService.lambdaQuery()
+                .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WorkerGoods::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .select(WorkerGoods::getStatus, WorkerGoods::getGoodsId).list();
+
+        materialCount.setAllmWorkerGoodsNum(
+                Convert.toInt(workerGoodsList.stream().count())
+        );
+
+        materialCount.setOnmWorkerGoodsNum(
+                Convert.toInt(workerGoodsList.stream().filter(item ->
+                        item.getStatus().equals(StateEnum.ON.getKey())
+                ).count())
+        );
+
+        materialCount.setOffmWorkerGoodsNum(
+                Convert.toInt(workerGoodsList.stream().filter(item ->
+                        item.getStatus().equals(StateEnum.OFF.getKey())
+                ).count())
+        );
+
+
+        List<WebsitVenderGoods> websitVenderGoods = websitVenderGoodsService.lambdaQuery()
+                .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitVenderGoods::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .select(WebsitVenderGoods::getStatus, WebsitVenderGoods::getVenderId).list();
+
+
+        materialCount.setAllPNum(
+                Convert.toInt(websitVenderGoods.stream().count())
+        );
+
+        materialCount.setSavePNum(
+                Convert.toInt(websitVenderGoods.stream().filter(item ->
+                        item.getStatus().equals(ExamineStatusEnum.SAVE.getKey())
+                ).count())
+        );
+
+        materialCount.setOnPNum(
+                Convert.toInt(websitVenderGoods.stream().filter(item ->
+                        item.getStatus().equals(ExamineStatusEnum.OK.getKey())
+                ).count())
+        );
+
+
+        List<WebsitPurchase> websitPurchaseList = websitPurchaseService.lambdaQuery()
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPurchase::getWebsitId, adminUser.getAdminWebsitIds())
+                .select(WebsitPurchase::getIsRecheck, WebsitPurchase::getPurchaseId,WebsitPurchase::getFlag).list();
+
+
+        materialCount.setWebsitCheckNum(
+                Convert.toInt(websitPurchaseList.stream().count())
+        );
+
+        materialCount.setWebsitCheckNeverNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        item.getIsRecheck().equals(IsYesNoEnum.NO.getKey())
+                ).count())
+        );
+
+        materialCount.setWebsitCheckYesNum(
+                Convert.toInt(websitPurchaseList.stream().filter(item ->
+                        item.getIsRecheck().equals(IsYesNoEnum.YES.getKey())
+                ).count())
+        );
+
+
         List<WebsitPriceUpd> websitPriceUpds = websitPriceUpdService.lambdaQuery()
                 .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPriceUpd::getWebsitId, adminUser.getAdminWebsitIds())
                 .select(WebsitPriceUpd::getFlag, WebsitPriceUpd::getSheetId, WebsitPriceUpd::getGoodsType).list();
@@ -601,16 +673,12 @@ public class CountLogic {
         );
 
 
-        List<WebsitPartsRet> websitPartsRets = websitPartsRetService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()), WebsitPartsRet::getWebsitId, adminUser.getAdminWebsitIds())
-                .select(WebsitPartsRet::getFlag, WebsitPartsRet::getPartsRetId, WebsitPartsRet::getGoodsType,WebsitPartsRet::getType).list();
-
 
         return materialCount;
     }
 
-    public MaterialCount MaterialPeiJianCount(HttpServletRequest request) {
+    public MaterialPeiJianCount MaterialPeiJianCount(HttpServletRequest request) {
 
-        return new MaterialCount();
+        return new MaterialPeiJianCount();
     }
 }