From 766798f98c602893882bad4587b18875b1a8e069 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 14 Jan 2021 17:10:35 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java |  159 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 146 insertions(+), 13 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java
index 91ddd37..cc69c56 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java
@@ -11,25 +11,19 @@
 public class BusinessesDataShowVo {
 
     @ApiModelProperty(value = "时间")
-    private String time;
+    private String dataTime;
 
     @ApiModelProperty(value = "营业收入")
     private String totalPay;
 
-    @ApiModelProperty(value = "现金收入")
+    @ApiModelProperty(value = "现金收款")
     private String cashPay;
 
-    @ApiModelProperty(value = "余额划扣")
+    @ApiModelProperty(value = "储值卡收款")
     private String cardPay;
 
     @ApiModelProperty(value = "欠款")
     private String arrearsPay;
-
-    @ApiModelProperty(value = "赠送消耗")
-    private String freeConsumePay;
-
-    @ApiModelProperty(value = "本金消耗")
-    private String consumePay;
 
     @ApiModelProperty(value = "现金退款")
     private String refundCashPay;
@@ -37,12 +31,55 @@
     @ApiModelProperty(value = "卡项退款")
     private String refundCardPay;
 
-    public String getTime() {
-        return time;
+    @ApiModelProperty(value = "产品业绩")
+    private String productAchieve;
+
+    @ApiModelProperty(value = "卡项业绩")
+    private String cardAchieve;
+
+    @ApiModelProperty(value = "退款")
+    private String refund;
+
+    @ApiModelProperty(value = "客单数")
+    private String perCustomCnt;
+
+    @ApiModelProperty(value = "客品数")
+    private String customGoodsCnt;
+
+    @ApiModelProperty(value = "客单价")
+    private String perCustomPrice;
+
+    @ApiModelProperty(value = "成本")
+    private String cost;
+
+    @ApiModelProperty(value = "毛利")
+    private String grossProfit;
+
+    @ApiModelProperty(value = "毛利率")
+    private String grossProfitRate;
+
+    @ApiModelProperty(value = "本金消耗")
+    private String consumePay;
+
+    @ApiModelProperty(value = "赠送消耗")
+    private String freeConsumePay;
+
+    @ApiModelProperty(value = "人头数")
+    private String peopleCnt;
+
+    @ApiModelProperty(value = "项目消耗数")
+    private String projConsumeCnt;
+
+    @ApiModelProperty(value = "服务时长")
+    private String timeLength;
+
+
+    public String getDataTime() {
+        return dataTime;
     }
 
-    public void setTime(String time) {
-        this.time = time;
+    public void setDataTime(String dataTime) {
+        this.dataTime = dataTime;
     }
 
     public String getTotalPay() {
@@ -108,4 +145,100 @@
     public void setRefundCardPay(String refundCardPay) {
         this.refundCardPay = refundCardPay;
     }
+
+    public String getProductAchieve() {
+        return productAchieve;
+    }
+
+    public void setProductAchieve(String productAchieve) {
+        this.productAchieve = productAchieve;
+    }
+
+    public String getCardAchieve() {
+        return cardAchieve;
+    }
+
+    public void setCardAchieve(String cardAchieve) {
+        this.cardAchieve = cardAchieve;
+    }
+
+    public String getRefund() {
+        return refund;
+    }
+
+    public void setRefund(String refund) {
+        this.refund = refund;
+    }
+
+    public String getPerCustomCnt() {
+        return perCustomCnt;
+    }
+
+    public void setPerCustomCnt(String perCustomCnt) {
+        this.perCustomCnt = perCustomCnt;
+    }
+
+    public String getCustomGoodsCnt() {
+        return customGoodsCnt;
+    }
+
+    public void setCustomGoodsCnt(String customGoodsCnt) {
+        this.customGoodsCnt = customGoodsCnt;
+    }
+
+    public String getPerCustomPrice() {
+        return perCustomPrice;
+    }
+
+    public void setPerCustomPrice(String perCustomPrice) {
+        this.perCustomPrice = perCustomPrice;
+    }
+
+    public String getCost() {
+        return cost;
+    }
+
+    public void setCost(String cost) {
+        this.cost = cost;
+    }
+
+    public String getGrossProfit() {
+        return grossProfit;
+    }
+
+    public void setGrossProfit(String grossProfit) {
+        this.grossProfit = grossProfit;
+    }
+
+    public String getGrossProfitRate() {
+        return grossProfitRate;
+    }
+
+    public void setGrossProfitRate(String grossProfitRate) {
+        this.grossProfitRate = grossProfitRate;
+    }
+
+    public String getPeopleCnt() {
+        return peopleCnt;
+    }
+
+    public void setPeopleCnt(String peopleCnt) {
+        this.peopleCnt = peopleCnt;
+    }
+
+    public String getProjConsumeCnt() {
+        return projConsumeCnt;
+    }
+
+    public void setProjConsumeCnt(String projConsumeCnt) {
+        this.projConsumeCnt = projConsumeCnt;
+    }
+
+    public String getTimeLength() {
+        return timeLength;
+    }
+
+    public void setTimeLength(String timeLength) {
+        this.timeLength = timeLength;
+    }
 }

--
Gitblit v1.9.1