From 86d65e6f837ff14b090ffc3312c013987b6f67d8 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 十月 2025 21:59:13 +0800
Subject: [PATCH] 荣誉 新增两个字段的查询
---
zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java | 186 +++++++++++++++++----------------------------
1 files changed, 71 insertions(+), 115 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
index 9b3db02..bce44bb 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
@@ -1,10 +1,17 @@
package com.ruoyi.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import lombok.Data;
+import lombok.ToString;
+
import java.io.Serializable;
import java.time.LocalDate;
+import java.util.Date;
/**
* <p>
@@ -15,194 +22,143 @@
* @since 2023-03-12
*/
@TableName("zf_pet")
+@Data
+@ToString
public class ZfPet implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private String id;
+ private String fileName;
/**
- * 鐘瘉鍙风爜
+ * 瀹犵墿鍙风爜
*/
+ @Excel(name = "瀹犵墿鍙风爜")
private String idNum;
/**
* 闃蹭吉鐮�
*/
+ @Excel(name = "闃蹭吉鐮�")
private String securityCode;
/**
- * 鐘
+ * 瀹犵墿鍝佺
*/
+ @Excel(name = "瀹犵墿鍝佺")
private String type;
+ @Excel(name = "瀹犵墿绫诲瀷")
+ private String animal;
+
/**
- * 鐘悕
+ * 瀹犵墿鍚嶇О
*/
+ @Excel(name = "瀹犵墿鍚嶇О")
private String name;
/**
* 鍑虹敓鏃ユ湡
*/
- private LocalDate birth;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍑虹敓鏃ユ湡", dateFormat = "yyyy-MM-dd")
+ private Date birth;
/**
* 鎬у埆,0:闆�,1:闆�
*/
+ @Excel(name = "鎬у埆",readConverterExp = "0=闆�,1=闆�")
private Integer sex;
/**
- * 鐘彧棰滆壊
+ * 瀹犵墿棰滆壊
*/
+ @Excel(name = "瀹犵墿棰滆壊")
private String color;
/**
- * 鐘彧鎬ц川
+ * 瀹犵墿鎬ц川
*/
+ @Excel(name = "瀹犵墿鎬ц川")
private String properties;
/**
* 楗涔犳儻
*/
+ @Excel(name = "楗涔犳儻(鍠滃ソ)")
private String eatHabit;
/**
* 鐢熸椿涔犳儻
*/
+ @Excel(name = "鐢熸椿涔犳儻(鍠滃ソ)")
private String lifeHabit;
+
+ @Excel(name = "楗涔犳儻(鍘屾伓)")
+ private String disEatHabit;
+
+ @Excel(name = "鐢熸椿涔犳儻(鍘屾伓)")
+ private String disLifeHabit;
/**
* 鐘眳浣忓湴鍧�
*/
+ @Excel(name = "瀹犵墿灞呬綇鍦板潃")
private String address;
/**
* 鑳藉惉鎳傜殑鏂硅█
*/
+ @Excel(name = "鑳藉惉鎳傜殑鏂硅█")
private String dialect;
+ private Long familyId;
- public Integer getId() {
- return id;
- }
+ @TableField(exist = false)
+ private Integer ownData;
- public void setId(Integer id) {
- this.id = id;
- }
- public String getIdNum() {
- return idNum;
- }
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
- public void setIdNum(String idNum) {
- this.idNum = idNum;
- }
+ /**
+ * 澶村儚
+ */
+ private String headPicture;
- public String getSecurityCode() {
- return securityCode;
- }
+ /**
+ * 鍏ㄨ韩鐓�
+ */
+ private String fullPicture;
- public void setSecurityCode(String securityCode) {
- this.securityCode = securityCode;
- }
+ //浠ヤ笅鏄富浜轰俊鎭�
- public String getType() {
- return type;
- }
+ @Excel(name = "涓讳汉鍚嶅瓧")
+ private String masterName;
- public void setType(String type) {
- this.type = type;
- }
+ @Excel(name = "涓讳汉璇佷欢鍙风爜")
+ private String masterIdNum;
- public String getName() {
- return name;
- }
+ @Excel(name = "涓讳汉鐢佃瘽鍙风爜")
+ private String phone;
- public void setName(String name) {
- this.name = name;
- }
+ @Excel(name = "涓讳汉鍦板潃")
+ private String masterAddress;
- public LocalDate getBirth() {
- return birth;
- }
+ @TableField(exist = false)
+ @Excel(name = "鍑虹敓鏃ユ湡", dateFormat = "yyyy-MM-dd")
+ private Date birthStart;
- public void setBirth(LocalDate birth) {
- this.birth = birth;
- }
+ @TableField(exist = false)
+ @Excel(name = "鍑虹敓鏃ユ湡", dateFormat = "yyyy-MM-dd")
+ private Date birthEnd;
- public Integer getSex() {
- return sex;
- }
+ /**
+ * 鍒嗕韩浜篿d
+ */
+ private Integer shareId;
- public void setSex(Integer sex) {
- this.sex = sex;
- }
- public String getColor() {
- return color;
- }
-
- public void setColor(String color) {
- this.color = color;
- }
-
- public String getProperties() {
- return properties;
- }
-
- public void setProperties(String properties) {
- this.properties = properties;
- }
-
- public String getEatHabit() {
- return eatHabit;
- }
-
- public void setEatHabit(String eatHabit) {
- this.eatHabit = eatHabit;
- }
-
- public String getLifeHabit() {
- return lifeHabit;
- }
-
- public void setLifeHabit(String lifeHabit) {
- this.lifeHabit = lifeHabit;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getDialect() {
- return dialect;
- }
-
- public void setDialect(String dialect) {
- this.dialect = dialect;
- }
-
- @Override
- public String toString() {
- return "ZfPet{" +
- "id=" + id +
- ", idNum=" + idNum +
- ", securityCode=" + securityCode +
- ", type=" + type +
- ", name=" + name +
- ", birth=" + birth +
- ", sex=" + sex +
- ", color=" + color +
- ", properties=" + properties +
- ", eatHabit=" + eatHabit +
- ", lifeHabit=" + lifeHabit +
- ", address=" + address +
- ", dialect=" + dialect +
- "}";
- }
}
--
Gitblit v1.9.1