From a894bc6373154d5cfd28b7f46df3c4cfa01a7b9b Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 24 四月 2024 11:46:33 +0800
Subject: [PATCH] 代码提交
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
index 83d4bf5..1372af0 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
@@ -8,12 +9,9 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.List;
/**
* 鎹愮尞鍣ㄥ畼绠＄悊瀵硅薄 service_donateorgan
@@ -82,6 +80,14 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍣ㄥ畼鑾峰彇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date organgettime;
+
+ /**
+ * 棰勮鑾峰彇鏃堕棿
+ */
+ @ApiModelProperty("棰勮鑾峰彇鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "棰勮鑾峰彇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date estimatedtime;
/**
* 鍖荤敓濮撳悕
@@ -199,7 +205,7 @@
@ApiModelProperty("鐢宠鏃堕棿")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date applicanttime;
@ApiModelProperty("瀹℃牳浜虹紪鍙�")
@@ -301,12 +307,35 @@
private Integer transplantstate;
-
- /** 绯荤粺缂栧彿 */
+ /**
+ * 绯荤粺缂栧彿
+ */
@ApiModelProperty("绯荤粺缂栧彿")
@Excel(name = "绯荤粺缂栧彿")
private String caseno;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date starttime;
+
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date endtime;
+
+ @TableField(exist = false)
+ private String city;
+
+ /**
+ * 鎶ュ憡鑰呯紪鍙�
+ */
+ @TableField(exist = false)
+ private String reporterno;
+
+
}
--
Gitblit v1.9.3