From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改

---
 src/main/java/org/springblade/modules/sale/entity/Sale.java |   88 ++++++++++++++++++++++++++++++-------------
 1 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/springblade/modules/sale/entity/Sale.java b/src/main/java/org/springblade/modules/sale/entity/Sale.java
index 7a2169d..68eea33 100644
--- a/src/main/java/org/springblade/modules/sale/entity/Sale.java
+++ b/src/main/java/org/springblade/modules/sale/entity/Sale.java
@@ -16,12 +16,16 @@
  */
 package org.springblade.modules.sale.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import org.springblade.core.mp.base.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 销售记录表实体类
@@ -37,29 +41,59 @@
 	private static final long serialVersionUID = 1L;
 
 	/**
-	* 品种id
-	*/
-		private Integer strainId;
-	/**
-	* 销售时间
-	*/
-		private LocalDateTime saleTime;
-	/**
-	* 销售数量
-	*/
-		private Integer saleNum;
-	/**
-	* 销售去向
-	*/
-		private Integer saleDestination;
-	/**
-	* 具体销售去向
-	*/
-		private String saleDestination1;
-	/**
-	* 销售价格
-	*/
-		private Double salePrice;
+	 * 主键id
+	 */
+	@TableId(value = "id",type = IdType.AUTO)
+	private Long id;
 
-
+	/**
+	 * 品种id
+	 */
+	private String strainId;
+	/**
+	 * 销售时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date saleTime;
+	/**
+	 * 销售数量
+	 */
+	private Double saleNum;
+	/**
+	 * 销售去向（省）
+	 */
+	private Integer saleDestination;
+	/**
+	 * 具体销售去向
+	 */
+	private String saleDestination1;
+	/**
+	 * 销售价格
+	 */
+	private Double salePrice;
+	/**
+	 * 销售去向（市）
+	 */
+	private Integer city;
+	/**
+	 * 销售去向（县）
+	 */
+	private Integer county;
+	/**
+	 * 品牌
+	 */
+	private String saleBrand;
+	/**
+	 * 地块id
+	 */
+	private String landId;
+	/**
+	 * 品种类型（0农产品、1加工产品）
+	 */
+	private Integer type;
+	/**
+	 * 各自库存的主键
+	 */
+	private String prodId;
 }

--
Gitblit v1.9.3