数据报表-销量 增加销售金额 退款金额

eladmin-system/src/main/java/cn/ysk/cashier/dto/ShopSummaryDto.java

@@ -1,5 +1,6 @@
 package cn.ysk.cashier.dto;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
 
@@ -7,12 +8,20 @@ public class ShopSummaryDto {
     private String shopId;
     private String proName;
     private Integer type;
-    private Integer cateId;
+    private String cateId;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
 
+    public String getCateId() {
+        return cateId;
+    }
+
+    public void setCateId(String cateId) {
+        this.cateId = cateId;
+    }
+
     public String getShopId() {
         return shopId;
     }
@@ -26,7 +35,9 @@ public class ShopSummaryDto {
     }
 
     public void setProName(String proName) {
-        this.proName = proName;
+        if(StringUtils.isNotBlank(proName)){
+            this.proName = proName;
+        }
     }
 
     public Integer getType() {
@@ -37,14 +48,6 @@ public class ShopSummaryDto {
         this.type = type;
     }
 
-    public Integer getCateId() {
-        return cateId;
-    }
-
-    public void setCateId(Integer cateId) {
-        this.cateId = cateId;
-    }
-
     public Date getStartTime() {
         return startTime;
     }