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 | 257 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 226 insertions(+), 31 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 21cbdad..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,146 +1,341 @@
package com.ruoyi.project.domain;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
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;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
/**
* 鎹愮尞鍣ㄥ畼绠＄悊瀵硅薄 service_donateorgan
- *
+ *
* @author ruoyi
* @date 2021-11-10
*/
@Data
@ApiModel("鎹愮尞鍣ㄥ畼绠＄悊")
-public class ServiceDonateorgan extends BaseEntity
-{
+public class ServiceDonateorgan extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** $column.columnComment */
+ /**
+ * $column.columnComment
+ */
@ApiModelProperty("$column.columnComment")
//鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
@TableId(type = IdType.AUTO)
private Long id;
- /** 鍏宠仈service_donatebaseinfo琛ㄧ殑ID */
+ /**
+ * 鍏宠仈service_donatebaseinfo琛ㄧ殑ID
+ */
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
- /** 鎹愮尞鑰呯紪鍙� */
+ /**
+ * 鎹愮尞鑰呯紪鍙�
+ */
@ApiModelProperty("鎹愮尞鑰呯紪鍙�")
@Excel(name = "鎹愮尞鑰呯紪鍙�")
private String donorno;
- /** 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ */
- @ApiModelProperty("鍣ㄥ畼绫诲埆")
+ /**
+ * 鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ
+ */
+ @ApiModelProperty("鍣ㄥ畼绫诲埆")
@Excel(name = "鍣ㄥ畼绫诲埆 璇﹁瀛楀吀sys_Organ")
private String organno;
- /** 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ */
+ /**
+ * 鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ
+ */
@ApiModelProperty("鍣ㄥ畼绫诲埆鍚嶇О")
@Excel(name = "鍣ㄥ畼绫诲埆鍚嶇О 璇﹁瀛楀吀sys_Organ")
private String organname;
- /** 鍣ㄥ畼鐘舵�� 1锛氶鐧昏 2锛氬凡鑾峰彇 3锛氬垎閰嶇櫥璁� 4锛氬垎閰嶅鏍革紙宸插垎閰嶏級 4锛氳繍杈撲腑 5锛氬凡绉绘 */
+ /**
+ * 鍣ㄥ畼鐘舵�� 1锛氶鐧昏 2锛氬凡鑾峰彇 3锛氬垎閰嶇櫥璁� 4锛氬垎閰嶅鏍革紙宸插垎閰嶏級 4锛氳繍杈撲腑 5锛氬凡绉绘
+ */
@Excel(name = "鍣ㄥ畼鐘舵�� 1锛氶鐧昏 2锛氬凡鑾峰彇 3锛氬垎閰嶇櫥璁� 4锛氬垎閰嶅鏍�", readConverterExp = "宸插垎閰�")
@ApiModelProperty("鍣ㄥ畼鐘舵��")
private String organstate;
- /** 鍣ㄥ畼缂栧彿 瑙佽瘉鐧昏鍚庣敓鎴� */
+ /**
+ * 鍣ㄥ畼缂栧彿 瑙佽瘉鐧昏鍚庣敓鎴�
+ */
@ApiModelProperty("鍣ㄥ畼缂栧彿")
@Excel(name = "鍣ㄥ畼缂栧彿 瑙佽瘉鐧昏鍚庣敓鎴�")
private String organnumber;
- /** 鍣ㄥ畼鑾峰彇鏃堕棿 */
+ /**
+ * 鍣ㄥ畼鑾峰彇鏃堕棿
+ */
@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;
+
+ /**
+ * 鍖荤敓濮撳悕
+ */
@ApiModelProperty("鍖荤敓濮撳悕")
@Excel(name = "鍖荤敓濮撳悕")
private String organgetdoct;
- /** 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿")
@Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
private String gainhospitalno;
- /** 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О")
@Excel(name = "鍣ㄥ畼鑾峰彇鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
private String gainhospitalname;
- /** 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯缂栧彿")
@Excel(name = "鍣ㄥ畼绉绘鏈烘瀯缂栧彿 瀵瑰簲鏈烘瀯琛�")
private String transplanthospitalno;
- /** 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛� */
+ /**
+ * 鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�
+ */
@ApiModelProperty("鍣ㄥ畼绉绘鏈烘瀯鍚嶇О")
@Excel(name = "鍣ㄥ畼绉绘鏈烘瀯鍚嶇О 瀵瑰簲鏈烘瀯琛�")
private String transplanthospitalname;
- /** 绉绘鍖荤敓 */
+ /**
+ * 绉绘鍖荤敓
+ */
@ApiModelProperty("绉绘鍖荤敓")
@Excel(name = "绉绘鍖荤敓")
private String transplantdoct;
- /** 绉绘鏃堕棿 */
+ /**
+ * 绉绘鏃堕棿
+ */
@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;
- /** 鏄惁鑾峰彇鍓嶆椿妫� */
+ /**
+ * 鏄惁鑾峰彇鍓嶆椿妫�
+ */
@ApiModelProperty("鏄惁鑾峰彇鍓嶆椿妫�")
@Excel(name = "鏄惁鑾峰彇鍓嶆椿妫�")
private String isbiopsybefore;
- /** 鏄惁鑾峰彇鍚庢椿妫� */
+ /**
+ * 鏄惁鑾峰彇鍚庢椿妫�
+ */
@ApiModelProperty("鏄惁鑾峰彇鍚庢椿妫�")
@Excel(name = "鏄惁鑾峰彇鍚庢椿妫�")
private String isbiopsyafter;
- /** 鏄惁杈圭紭鍣ㄥ畼 */
+ /**
+ * 鏄惁杈圭紭鍣ㄥ畼
+ */
@ApiModelProperty("鏄惁杈圭紭鍣ㄥ畼")
@Excel(name = "鏄惁杈圭紭鍣ㄥ畼")
private String ismarginalorgan;
- /** 鏄惁鐥呭師鑿岄槼鎬� */
+ /**
+ * 鏄惁鐥呭師鑿岄槼鎬�
+ */
@ApiModelProperty("鏄惁鐥呭師鑿岄槼鎬�")
@Excel(name = "鏄惁鐥呭師鑿岄槼鎬�")
private String ispathogenpositive;
- /** 鏄惁鍘熷彂鎬ф棤鍔熻兘 */
+ /**
+ * 鏄惁鍘熷彂鎬ф棤鍔熻兘
+ */
@ApiModelProperty("鏄惁鍘熷彂鎬ф棤鍔熻兘")
@Excel(name = "鏄惁鍘熷彂鎬ф棤鍔熻兘")
private String ispnf;
- /** 鏄惁鍔熻兘寤惰繜鎬ф仮澶� */
+ /**
+ * 鏄惁鍔熻兘寤惰繜鎬ф仮澶�
+ */
@ApiModelProperty("鏄惁鍔熻兘寤惰繜鎬ф仮澶�")
@Excel(name = "鏄惁鍔熻兘寤惰繜鎬ф仮澶�")
private String isdgf;
- /** 寮冪敤鍘熷洜 */
+ /**
+ * 寮冪敤鍘熷洜
+ */
@ApiModelProperty("寮冪敤鍘熷洜")
@Excel(name = "寮冪敤鍘熷洜")
private String abandonreason;
- /** 閲嶆柊鍒嗛厤鍘熷洜 */
+ /**
+ * 閲嶆柊鍒嗛厤鍘熷洜
+ */
@ApiModelProperty("閲嶆柊鍒嗛厤鍘熷洜")
@Excel(name = "閲嶆柊鍒嗛厤鍘熷洜")
private String reallocationreason;
+ @ApiModelProperty("鐢宠浜虹紪鍙�")
+ private String applicantuserid;
+
+ @ApiModelProperty("鐢宠浜哄鍚�")
+ private String applicantusername;
+
+ @ApiModelProperty("鐢宠鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date applicanttime;
+
+ @ApiModelProperty("瀹℃牳浜虹紪鍙�")
+ private String checkuserid;
+
+ @ApiModelProperty("瀹℃牳浜哄鍚�")
+ private String checkusername;
+
+ @ApiModelProperty("瀹℃牳鏃堕棿")
+ private Date checktime;
+
+ @ApiModelProperty("瀹℃牳鎰忚")
+ private String checksuggestion;
+
+
+ @ApiModelProperty("0:鎻愪氦鍒嗛厤锛�1锛氬鏍搁�氳繃锛�2锛氬鏍告嫆缁�")
+ private Integer allocationstatus;
+
+ @ApiModelProperty("绉绘浜哄鍚�")
+ private String name;
+
+ @ApiModelProperty("绉绘浜烘�у埆 鏍规嵁瀛楀吀sys_user_sex")
+ private Integer sex;
+
+ @ApiModelProperty("绉绘浜鸿瘉浠剁被鍨� 鏍规嵁瀛楀吀sys_IDType")
+ private Integer idcardtype;
+
+ @ApiModelProperty("绉绘浜鸿瘉浠跺彿鐮�")
+ private String idcardno;
+
+ @ApiModelProperty("绉绘浜哄勾榫�")
+ private Integer age;
+
+ @ApiModelProperty("绉绘浜哄勾榫勫崟浣� 鏍规嵁瀛楀吀sys_AgeUnit")
+ private String ageunit;
+
+ @ApiModelProperty("绉绘浜哄嚭鐢熸棩鏈�")
+ private String birthday;
+
+ @ApiModelProperty("绉绘浜鸿仈绯荤數璇�")
+ private String phone;
+
+ @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�")
+ private String residenceaddress;
+
+ @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佷唬鐮�")
+ private String residenceprovince;
+
+ @ApiModelProperty("绉绘浜虹幇浣忓湴鍧�鐪佸悕绉�")
+ private String residenceprovincename;
+
+ @ApiModelProperty("绉绘浜哄競缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residencecity;
+
+ @ApiModelProperty("绉绘浜哄競鍚嶇О")
+ private String residencecityname;
+
+ @ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residencetown;
+
+ @ApiModelProperty("绉绘浜烘墍灞炶閬擄紙闀囷級鍚嶇О")
+ private String residencetownname;
+
+ @ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級缂栧彿 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residencecommunity;
+
+ @ApiModelProperty("绉绘浜虹ぞ鍖猴紙鏉戯級鍚嶇О")
+ private String residencecommunityname;
+
+ @ApiModelProperty("绉绘浜烘墍灞炲尯鍩熺紪鍙� 鏍规嵁琛屾斂鍖哄垝琛�")
+ private String residencecountycode;
+
+ @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