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/farmplant/entity/FarmPlant.java |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java b/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
index 6dfb787..c81f18d 100644
--- a/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
+++ b/src/main/java/org/springblade/modules/farmplant/entity/FarmPlant.java
@@ -1,12 +1,9 @@
 package org.springblade.modules.farmplant.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -25,7 +22,7 @@
 	 * 主键id
 	 */
 	@TableId(value = "id",type = IdType.AUTO)
-	private Integer id;
+	private Long id;
 
 	/**
 	 * 土地id
@@ -77,16 +74,19 @@
 	/**
 	 * 预计亩产
 	 */
+	@TableField(value = "per",updateStrategy = FieldStrategy.IGNORED)
 	private Integer per;
 
 	/**
 	 * 株数
 	 */
+	@TableField(value = "plant_number",updateStrategy = FieldStrategy.IGNORED)
 	private Integer plantNumber;
 
 	/**
 	 * 株间距
 	 */
+	@TableField(value = "plant_spacing",updateStrategy = FieldStrategy.IGNORED)
 	private Integer plantSpacing;
 
 
@@ -119,4 +119,29 @@
 	 */
 	private String createUser;
 
+	/**
+	 * 种植状态 1：种植中 2：已采收
+	 */
+	private String status;
+
+
+	/**
+	 * 部门id
+	 */
+	private String deptId;
+
+	/**
+	 * 租户id
+	 */
+	private String tenantId;
+	/**
+	 * 结束种养时间
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date endPlantTime;
+	/**
+	 * 移栽时，移栽来源的地块id
+	 */
+	private String otherLandId;
 }

--
Gitblit v1.9.3