From 0293e06edd011d6921ec2cc08392042f5765dfb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 18 九月 2025 13:35:54 +0800
Subject: [PATCH] 日志修改

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java |   71 ++++++++++++++++++++++++++++++++++-
 1 files changed, 69 insertions(+), 2 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 f28723d..3b36f1b 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,6 +9,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -75,9 +77,17 @@
      * 鍣ㄥ畼鑾峰彇鏃堕棿
      */
     @ApiModelProperty("鍣ㄥ畼鑾峰彇鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "鍣ㄥ畼鑾峰彇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date organgettime;
+
+    /**
+     * 棰勮鑾峰彇鏃堕棿
+     */
+    @ApiModelProperty("棰勮鑾峰彇鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Excel(name = "棰勮鑾峰彇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date estimatedtime;
 
     /**
      * 鍖荤敓濮撳悕
@@ -125,7 +135,7 @@
      * 绉绘鏃堕棿
      */
     @ApiModelProperty("绉绘鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "绉绘鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date transplanttime;
 
@@ -194,6 +204,8 @@
     private String applicantusername;
 
     @ApiModelProperty("鐢宠鏃堕棿")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date applicanttime;
 
     @ApiModelProperty("瀹℃牳浜虹紪鍙�")
@@ -269,6 +281,61 @@
     @ApiModelProperty("绉绘浜烘墍灞炲尯鍩熷悕绉�")
     private String residencecountyname;
 
+    @ApiModelProperty("鍣ㄥ畼璐圭敤")
+    private Double organcharge;
+
+    @ApiModelProperty("鍣ㄥ畼璐圭敤")
+    private String organchargeoperator;
+
+    @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤鏃堕棿")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date organchargedate;
+
+    @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤")
+    private Double organamount;
+
+    @ApiModelProperty("鍣ㄥ畼璐圭敤鏀跺彇鐘舵��: 0: 鏈敹鍙栵紝1: 宸叉敹鍙�")
+    private Integer chargestate;
+
+    @ApiModelProperty("鍣ㄥ畼瀹為檯鏀跺埌璐圭敤璇存槑")
+    private String organchargedesc;
+
+    @ApiModelProperty("鏈幏鍙栧師鍥�")
+    private String notgetreason;
+
+    @ApiModelProperty("瀹樼Щ鎭掔姸鎬� : 0: 鏈Щ: 1: 宸茬Щ妞�")
+    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