no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/report/MaterialSalesSumDetailBean.java

@@ -12,12 +12,6 @@ import java.util.Date;
 @ApiModel
 @Data
 public class MaterialSalesSumDetailBean extends WebsitSalesItem {
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-    @ApiModelProperty(value = "支付类型")
-    private String payType;
     @ApiModelProperty(value = "支付状态")
     private String payFlag;
     @ApiModelProperty(value = "工程师手机号")

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/report/PurchaseDetailBean.java

@@ -10,14 +10,8 @@ import lombok.EqualsAndHashCode;
 @Data
 @ApiModel
 public class PurchaseDetailBean extends WebsitPurchaseItem {
-    @ApiModelProperty(value = "网点编号")
-    private String websitid;
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
     @ApiModelProperty(value = "供应商编号")
     private String venderId;
     @ApiModelProperty(value = "供应商名称")
     private String venderName;
-    @ApiModelProperty(value = "类别名称")
-    private String goodsCategoryName;
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/report/ReportLogic.java

@@ -359,16 +359,16 @@ public class ReportLogic {
             excelData.setTitles(Collections.singletonList("暂无内容"));
             return excelData;
         }
-        String curShopId = purchaseDetailBeanList.get(0).getWebsitid();
+        String curShopId = purchaseDetailBeanList.get(0).getWebsitId();
 
         for (PurchaseDetailBean bean : purchaseDetailBeanList) {
             // 如果当前遍历网点编号和上一次遍历不一致 插入合计行
-            if (!curShopId.equals(bean.getWebsitid())) {
+            if (!curShopId.equals(bean.getWebsitId())) {
                 rows.add(addPurchaseSumRow(curShopId, purchaseDetailSumBeanList));
-                curShopId = bean.getWebsitid();
+                curShopId = bean.getWebsitId();
             }
             List<Object> row = new ArrayList<>();
-            row.add(bean.getWebsitid());
+            row.add(bean.getWebsitId());
             row.add(bean.getWebsitName());
             row.add(bean.getVenderName());
             row.add(bean.getGoodsName());
@@ -389,9 +389,9 @@ public class ReportLogic {
     private List<Object> addPurchaseSumRow(String curShopId, List<PurchaseDetailBean> purchaseDetailSumBeanList) {
         List<Object> sumRow = new ArrayList();
         PurchaseDetailBean bean = purchaseDetailSumBeanList.stream()
-                .filter(purchaseDetailBean -> purchaseDetailBean.getWebsitid().equals(curShopId))
+                .filter(purchaseDetailBean -> purchaseDetailBean.getWebsitId().equals(curShopId))
                 .collect(Collectors.toList()).get(0);
-        sumRow.add(bean.getWebsitid());
+        sumRow.add(bean.getWebsitId());
         sumRow.add(bean.getWebsitName());
         sumRow.add("");
         sumRow.add("");