From 0bb9f6c3e894e56ff58d335110fbe4cfa87b64b2 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 一月 2026 14:17:19 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java |   56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
index 15e5803..2b31817 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -1,5 +1,6 @@
 package com.ruoyi.project.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -33,6 +34,14 @@
     private Long id;
 
     /**
+     * 妗堜緥缂栧彿
+     */
+    @ApiModelProperty("妗堜緥缂栧彿")
+    @Excel(name = "妗堜緥缂栧彿")
+    private String caseNo;
+
+
+    /**
      * 濮撳悕
      */
     @ApiModelProperty("濮撳悕")
@@ -52,6 +61,12 @@
     private Long idcardtype;
 
     /**
+     * 妗堜緥涓婃姤ID
+     */
+    @ApiModelProperty("妗堜緥涓婃姤ID")
+    private Long reportId;
+
+    /**
      * 璇佷欢鍙风爜
      */
     @ApiModelProperty("璇佷欢鍙风爜")
@@ -60,14 +75,14 @@
     /**
      * 骞撮緞
      */
-    @TableField(exist = false)
+//    @TableField(exist = false)
     @ApiModelProperty("骞撮緞")
     private Long age;
 
     /**
      * 骞撮緞鍗曚綅
      */
-    @TableField(exist = false)
+//    @TableField(exist = false)
     @ApiModelProperty("骞撮緞鍗曚綅")
     private String ageunit;
     /**
@@ -89,7 +104,6 @@
      * 鍑虹敓鏃ユ湡
      */
     @ApiModelProperty("鍑虹敓鏃ユ湡")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date birthday;
 
     /**
@@ -487,7 +501,13 @@
      * 淇℃伅鍛樺鍚�
      */
     @ApiModelProperty("淇℃伅鍛樺鍚�")
-    private String infoname;
+    private String infoName;
+
+    /**
+     * 淇℃伅鍛樺鍚�
+     */
+    @ApiModelProperty("淇℃伅鍛樼紪鍙�")
+    private String infoNo;
 
     /**
      * 淇℃伅鍛樿仈绯绘柟寮�
@@ -537,7 +557,7 @@
     private String businessarea;
 
 
-    @ApiModelProperty("闄勪欢鍦板潃")
+    @ApiModelProperty("闄勪欢鍦板潃锛堜緵鑰呰瘎浼板悇椤硅褰曪級")
     @Excel(name = "闄勪欢鍦板潃")
     private String annexfiles;
 
@@ -551,9 +571,10 @@
     @Excel(name = "缁堟妗堜緥")
     private Integer terminationCase;
 
+    /** 妗堜緥鏃堕棿 */
     @ApiModelProperty("妗堜緥鏃堕棿")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date donatetime;
 
     @ApiModelProperty("妗堜緥搴忓彿")
@@ -571,5 +592,26 @@
     @ApiModelProperty("棣栨鍖荤枟鏈烘瀯绉戝")
     private String firstDept;
 
+    /**
+     * GSC璇勫垎
+     */
+    @ApiModelProperty("GSC璇勫垎")
+    @Excel(name = "GSC璇勫垎", readConverterExp = "GSC璇勫垎")
+    private String gcsScore;
+
+    /**
+     * 鍗忚皟鍛樼紪鍙�
+     */
+    @ApiModelProperty("鍗忚皟鍛樼紪鍙�")
+    @Excel(name = "鍗忚皟鍛樼紪鍙�", readConverterExp = "鍗忚皟鍛樼紪鍙�")
+    private String coordinatorNo;
+
+    /**
+     * 鍗忚皟鍛樺鍚�
+     */
+    @ApiModelProperty("鍗忚皟鍛樺鍚�")
+    @Excel(name = "鍗忚皟鍛樺鍚�", readConverterExp = "鍗忚皟鍛樺鍚�")
+    private String coordinatorName;
+
 
 }

--
Gitblit v1.9.3