From 05e8b12d65aa67415f0f32893449a9a48a6c9a48 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 18 Jan 2021 00:10:50 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java | 62 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
index b768fbb..6a5a4f5 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/AchieveNew.java
@@ -2,7 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.anotations.Extend;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -164,8 +164,11 @@
private String t2;
-
-
+
+
+ /**
+ * 业绩种类 1-现金业绩 2-划扣业绩
+ */
private String t3;
@@ -200,6 +203,8 @@
private String day;
+ private String vipQueryKey;
+
/**
* 订单编号
@@ -227,20 +232,22 @@
*/
private String meiliao;
+ private Integer arriveCnt;
+
/**
* 开始时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date beginTime;
/**
* 结束时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date endTime;
@@ -250,6 +257,51 @@
@Extend
private Double achieveMoney;
+ private String goodsNo;
+
+ private String goodsName;
+
+ private String type;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getGoodsNo() {
+ return goodsNo;
+ }
+
+ public void setGoodsNo(String goodsNo) {
+ this.goodsNo = goodsNo;
+ }
+
+ public String getGoodsName() {
+ return goodsName;
+ }
+
+ public void setGoodsName(String goodsName) {
+ this.goodsName = goodsName;
+ }
+
+ public Integer getArriveCnt() {
+ return arriveCnt;
+ }
+
+ public void setArriveCnt(Integer arriveCnt) {
+ this.arriveCnt = arriveCnt;
+ }
+
+ public String getVipQueryKey() {
+ return vipQueryKey;
+ }
+
+ public void setVipQueryKey(String vipQueryKey) {
+ this.vipQueryKey = vipQueryKey;
+ }
public Long getCompanyId() {
return companyId;
--
Gitblit v1.9.1